diff options
| author | David Shah <dave@ds0.me> | 2020-02-04 18:38:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-04 18:38:17 +0000 |
| commit | ca733561873cd54be047ae30a94efcd71b3f8be5 (patch) | |
| tree | 003774ef09fa30be7e41ad8703e5c0bd320fd0a9 /ecp5 | |
| parent | 1ceffbe0bcba4f31a40c58c436df9370899fa4a2 (diff) | |
| parent | a3b74f009c577860a1c2b7f618f3c9576586a1f2 (diff) | |
| download | nextpnr-ca733561873cd54be047ae30a94efcd71b3f8be5.tar.gz nextpnr-ca733561873cd54be047ae30a94efcd71b3f8be5.tar.bz2 nextpnr-ca733561873cd54be047ae30a94efcd71b3f8be5.zip | |
Merge pull request #392 from se-bi/fix/ecp5/cmake-paths
Fix paths to prjtrellies project
Diffstat (limited to 'ecp5')
| -rw-r--r-- | ecp5/family.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ecp5/family.cmake b/ecp5/family.cmake index 720fd19f..8756aa36 100644 --- a/ecp5/family.cmake +++ b/ecp5/family.cmake @@ -1,14 +1,14 @@ if (NOT EXTERNAL_CHIPDB) set(devices 25k 45k 85k) - if (NOT DEFINED TRELLIS_ROOT) - message(STATUS "TRELLIS_ROOT not defined using -DTRELLIS_ROOT=/path/to/prjtrellis. Default to /usr/local/share/trellis") - set(TRELLIS_ROOT "/usr/local/share/trellis") + if (NOT DEFINED TRELLIS_INSTALL_PREFIX) + message(STATUS "TRELLIS_INSTALL_PREFIX not defined using -DTRELLIS_INSTALL_PREFIX=/path-prefix/to/prjtrellis-installation. Default to /usr/local or reset by -DCMAKE_INSTALL_PREFIX when building prjtrellis/libtrellis") + set(TRELLIS_INSTALL_PREFIX "/usr/local") endif() if (NOT DEFINED PYTRELLIS_LIBDIR) find_library(PYTRELLIS pytrellis.so - PATHS ${TRELLIS_ROOT}/libtrellis + PATHS ${TRELLIS_INSTALL_PREFIX}/lib/trellis PATH_SUFFIXES trellis DOC "Location of pytrellis library") @@ -27,9 +27,9 @@ if (NOT EXTERNAL_CHIPDB) target_include_directories(ecp5_chipdb PRIVATE ${family}/) if (CMAKE_HOST_WIN32) - set(ENV_CMD ${CMAKE_COMMAND} -E env "PYTHONPATH=\"${PYTRELLIS_LIBDIR}\;${TRELLIS_ROOT}/util/common\;${TRELLIS_ROOT}/timing/util\"") + set(ENV_CMD ${CMAKE_COMMAND} -E env "PYTHONPATH=\"${PYTRELLIS_LIBDIR}\;${TRELLIS_INSTALL_PREFIX}/share/trellis/util/common\;${TRELLIS_INSTALL_PREFIX}/share/trellis/timing/util\"") else() - set(ENV_CMD ${CMAKE_COMMAND} -E env "PYTHONPATH=${PYTRELLIS_LIBDIR}\:${TRELLIS_ROOT}/util/common:${TRELLIS_ROOT}/timing/util") + set(ENV_CMD ${CMAKE_COMMAND} -E env "PYTHONPATH=${PYTRELLIS_LIBDIR}\:${TRELLIS_INSTALL_PREFIX}/share/trellis/util/common:${TRELLIS_INSTALL_PREFIX}/share/trellis/timing/util") endif() if (MSVC) |