diff options
| author | whitequark <whitequark@whitequark.org> | 2020-07-01 20:22:21 +0000 |
|---|---|---|
| committer | whitequark <whitequark@whitequark.org> | 2020-07-01 20:22:21 +0000 |
| commit | f6e30f22f4334c36a42622e8fddd9cd92d0fe543 (patch) | |
| tree | 224e63f2e2bea8c0e78284b563057dd205d36557 | |
| parent | c0901fb972e34d2d16b3ac0074a18542ba1c448d (diff) | |
| download | nextpnr-f6e30f22f4334c36a42622e8fddd9cd92d0fe543.tar.gz nextpnr-f6e30f22f4334c36a42622e8fddd9cd92d0fe543.tar.bz2 nextpnr-f6e30f22f4334c36a42622e8fddd9cd92d0fe543.zip | |
CMake: fix path checks in chipdb build scripts.
`if(NOT DEFINED)` is not appropriate since a variable that contains
`-NOTFOUND` still counts as `DEFINED`. This can cause issues if
configuration fails, writes `-NOTFOUND` to the cache, and is then
restarted.
| -rw-r--r-- | ecp5/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ice40/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ecp5/CMakeLists.txt b/ecp5/CMakeLists.txt index 303208ed..5bb82f4c 100644 --- a/ecp5/CMakeLists.txt +++ b/ecp5/CMakeLists.txt @@ -25,7 +25,7 @@ else() "Trellis install prefix") message(STATUS "Trellis install prefix: ${TRELLIS_INSTALL_PREFIX}") - if(NOT DEFINED TRELLIS_LIBDIR) + if(NOT TRELLIS_LIBDIR) if(WIN32) set(pytrellis_lib pytrellis.pyd) else() @@ -42,7 +42,7 @@ else() endif() message(STATUS "Trellis library directory: ${TRELLIS_LIBDIR}") - if(NOT DEFINED TRELLIS_DATADIR) + if(NOT TRELLIS_DATADIR) set(TRELLIS_DATADIR ${TRELLIS_INSTALL_PREFIX}/share/${TRELLIS_PROGRAM_PREFIX}trellis) endif() message(STATUS "Trellis data directory: ${TRELLIS_DATADIR}") diff --git a/ice40/CMakeLists.txt b/ice40/CMakeLists.txt index 1bf64905..89203bbc 100644 --- a/ice40/CMakeLists.txt +++ b/ice40/CMakeLists.txt @@ -27,7 +27,7 @@ else() "IceStorm install prefix") message(STATUS "IceStorm install prefix: ${ICESTORM_INSTALL_PREFIX}") - if(NOT DEFINED ICEBOX_DATADIR) + if(NOT ICEBOX_DATADIR) set(ICEBOX_DATADIR ${ICESTORM_INSTALL_PREFIX}/share/icebox) endif() message(STATUS "icebox data directory: ${ICEBOX_DATADIR}") |