diff options
| author | whitequark <whitequark@whitequark.org> | 2019-06-26 21:31:24 +0000 |
|---|---|---|
| committer | whitequark <whitequark@whitequark.org> | 2019-06-26 21:31:24 +0000 |
| commit | 1b3c8ea9c1384882063203f35f0f66f60025f62c (patch) | |
| tree | 755f98529f884b7f7b8180e6175bdffcf31782d8 /ice40 | |
| parent | 640285755e4c59eb14c8664e10a62653f2892e15 (diff) | |
| download | nextpnr-1b3c8ea9c1384882063203f35f0f66f60025f62c.tar.gz nextpnr-1b3c8ea9c1384882063203f35f0f66f60025f62c.tar.bz2 nextpnr-1b3c8ea9c1384882063203f35f0f66f60025f62c.zip | |
CMake: serialize chipdb generation by default.
Fixes #296.
Diffstat (limited to 'ice40')
| -rw-r--r-- | ice40/family.cmake | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ice40/family.cmake b/ice40/family.cmake index ddf99139..6c46f459 100644 --- a/ice40/family.cmake +++ b/ice40/family.cmake @@ -19,6 +19,7 @@ if (NOT EXTERNAL_CHIPDB) if (MSVC) target_sources(ice40_chipdb PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ice40/resource/embed.cc) set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/ice40/resources/chipdb.rc PROPERTIES LANGUAGE RC) + set(PREV_DEV_CC_BBA_DB) foreach (dev ${devices}) if (dev STREQUAL "5k") set(OPT_FAST "") @@ -40,12 +41,15 @@ if (NOT EXTERNAL_CHIPDB) set(DEV_GFXH ${CMAKE_CURRENT_SOURCE_DIR}/ice40/gfx.h) add_custom_command(OUTPUT ${DEV_CC_BBA_DB} COMMAND ${PYTHON_EXECUTABLE} ${DB_PY} -p ${DEV_CONSTIDS_INC} -g ${DEV_GFXH} ${OPT_FAST} ${OPT_SLOW} ${DEV_TXT_DB} > ${DEV_CC_BBA_DB} - DEPENDS ${DEV_CONSTIDS_INC} ${DEV_GFXH} ${DEV_TXT_DB} ${DB_PY} + DEPENDS ${DEV_CONSTIDS_INC} ${DEV_GFXH} ${DEV_TXT_DB} ${DB_PY} ${PREV_DEV_CC_BBA_DB} ) add_custom_command(OUTPUT ${DEV_CC_DB} COMMAND bbasm ${DEV_CC_BBA_DB} ${DEV_CC_DB} DEPENDS bbasm ${DEV_CC_BBA_DB} ) + if (SERIALIZE_CHIPDB) + set(PREV_DEV_CC_BBA_DB ${DEV_CC_BBA_DB}) + endif() target_sources(ice40_chipdb PRIVATE ${DEV_CC_DB}) set_source_files_properties(${DEV_CC_DB} PROPERTIES HEADER_FILE_ONLY TRUE) foreach (target ${family_targets}) @@ -54,6 +58,7 @@ if (NOT EXTERNAL_CHIPDB) endforeach() else() target_compile_options(ice40_chipdb PRIVATE -g0 -O0 -w) + set(PREV_DEV_CC_BBA_DB) foreach (dev ${devices}) if (dev STREQUAL "5k") set(OPT_FAST "") @@ -76,13 +81,16 @@ if (NOT EXTERNAL_CHIPDB) add_custom_command(OUTPUT ${DEV_CC_BBA_DB} COMMAND ${PYTHON_EXECUTABLE} ${DB_PY} -p ${DEV_CONSTIDS_INC} -g ${DEV_GFXH} ${OPT_FAST} ${OPT_SLOW} ${DEV_TXT_DB} > ${DEV_CC_BBA_DB}.new COMMAND mv ${DEV_CC_BBA_DB}.new ${DEV_CC_BBA_DB} - DEPENDS ${DEV_CONSTIDS_INC} ${DEV_GFXH} ${DEV_TXT_DB} ${DB_PY} + DEPENDS ${DEV_CONSTIDS_INC} ${DEV_GFXH} ${DEV_TXT_DB} ${DB_PY} ${PREV_DEV_CC_BBA_DB} ) add_custom_command(OUTPUT ${DEV_CC_DB} COMMAND bbasm --c ${DEV_CC_BBA_DB} ${DEV_CC_DB}.new COMMAND mv ${DEV_CC_DB}.new ${DEV_CC_DB} DEPENDS bbasm ${DEV_CC_BBA_DB} ) + if (SERIALIZE_CHIPDB) + set(PREV_DEV_CC_BBA_DB ${DEV_CC_BBA_DB}) + endif() target_sources(ice40_chipdb PRIVATE ${DEV_CC_DB}) foreach (target ${family_targets}) target_sources(${target} PRIVATE $<TARGET_OBJECTS:ice40_chipdb>) |