diff options
| author | Jared Boone <jboone@earfeast.com> | 2019-04-27 09:43:29 -0700 |
|---|---|---|
| committer | Sebastian Birke <git@se-bi.de> | 2020-02-04 18:19:45 +0100 |
| commit | 1b560ae44ce52db24bba7f5ac9bd54c2ba927349 (patch) | |
| tree | 2931bca0e75ec219350a6acf08e119c3747e2be8 | |
| parent | c95b140dec081cf1b6bd31af6dfe3c5b26667592 (diff) | |
| download | nextpnr-1b560ae44ce52db24bba7f5ac9bd54c2ba927349.tar.gz nextpnr-1b560ae44ce52db24bba7f5ac9bd54c2ba927349.tar.bz2 nextpnr-1b560ae44ce52db24bba7f5ac9bd54c2ba927349.zip | |
CMake: Changing the definition of TRELLIS_ROOT to point to root of lib, share containing trellis libs and data
two other commit message of squashed commits:
CMake: Search for user lib inside trellis instead of libtrellis
CMake: Fix missing path component for share contents
| -rw-r--r-- | ecp5/family.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ecp5/family.cmake b/ecp5/family.cmake index 720fd19f..24016e69 100644 --- a/ecp5/family.cmake +++ b/ecp5/family.cmake @@ -2,13 +2,13 @@ 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") + message(STATUS "TRELLIS_ROOT not defined using -DTRELLIS_ROOT=/path/to/prjtrellis. Default to /usr/local") + set(TRELLIS_ROOT "/usr/local") endif() if (NOT DEFINED PYTRELLIS_LIBDIR) find_library(PYTRELLIS pytrellis.so - PATHS ${TRELLIS_ROOT}/libtrellis + PATHS ${TRELLIS_ROOT}/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_ROOT}/share/trellis/util/common\;${TRELLIS_ROOT}/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_ROOT}/share/trellis/util/common:${TRELLIS_ROOT}/share/trellis/timing/util") endif() if (MSVC) |