diff options
| author | Eddie Hung <eddieh@ece.ubc.ca> | 2019-02-11 08:38:11 -0800 |
|---|---|---|
| committer | Eddie Hung <eddieh@ece.ubc.ca> | 2019-02-11 08:38:11 -0800 |
| commit | 7bd4fa99a1c3a45eef8fd6a754e124745e48d8e4 (patch) | |
| tree | d15b277762ccb9e528181c01f3b799342b4c5d83 | |
| parent | 4ac505701ed97dfa601ae33e0330a81bc034fc29 (diff) | |
| parent | 6cd0b8a12345a635351122ed3e4e635162767b3a (diff) | |
| download | nextpnr-7bd4fa99a1c3a45eef8fd6a754e124745e48d8e4.tar.gz nextpnr-7bd4fa99a1c3a45eef8fd6a754e124745e48d8e4.tar.bz2 nextpnr-7bd4fa99a1c3a45eef8fd6a754e124745e48d8e4.zip | |
Merge branch 'master' into regressions
| -rw-r--r-- | ecp5/family.cmake | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/ecp5/family.cmake b/ecp5/family.cmake index 679325b2..1d9b4532 100644 --- a/ecp5/family.cmake +++ b/ecp5/family.cmake @@ -6,12 +6,19 @@ if (NOT DEFINED TRELLIS_ROOT) set(TRELLIS_ROOT "/usr/local/share/trellis") endif() -file(GLOB found_pytrellis ${TRELLIS_ROOT}/libtrellis/pytrellis.*) +file(GLOB found_pytrellis ${TRELLIS_ROOT}/libtrellis/pytrellis.* + /usr/lib/pytrellis.* + /usr/lib64/pytrellis.* + /usr/lib/trellis/pytrellis.* + /usr/lib64/trellis/pytrellis.*) if ("${found_pytrellis}" STREQUAL "") - message(FATAL_ERROR "failed to find pytrellis library in ${TRELLIS_ROOT}/libtrellis/") + message(FATAL_ERROR "failed to locate pytrellis library!") endif() +list(GET found_pytrellis 0 PYTRELLIS_LIB) +get_filename_component(PYTRELLIS_LIBDIR ${PYTRELLIS_LIB} DIRECTORY) + set(DB_PY ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/trellis_import.py) file(MAKE_DIRECTORY ecp5/chipdbs/) @@ -20,9 +27,9 @@ target_compile_definitions(ecp5_chipdb PRIVATE NEXTPNR_NAMESPACE=nextpnr_${famil target_include_directories(ecp5_chipdb PRIVATE ${family}/) if (CMAKE_HOST_WIN32) -set(ENV_CMD ${CMAKE_COMMAND} -E env "PYTHONPATH=\"${TRELLIS_ROOT}/libtrellis\;${TRELLIS_ROOT}/util/common\;${TRELLIS_ROOT}/timing/util\"") +set(ENV_CMD ${CMAKE_COMMAND} -E env "PYTHONPATH=\"${PYTRELLIS_LIBDIR}\;${TRELLIS_ROOT}/util/common\;${TRELLIS_ROOT}/timing/util\"") else() -set(ENV_CMD ${CMAKE_COMMAND} -E env "PYTHONPATH=${TRELLIS_ROOT}/libtrellis:${TRELLIS_ROOT}/util/common:${TRELLIS_ROOT}/timing/util") +set(ENV_CMD ${CMAKE_COMMAND} -E env "PYTHONPATH=${PYTRELLIS_LIBDIR}\:${TRELLIS_ROOT}/util/common:${TRELLIS_ROOT}/timing/util") endif() if (MSVC) |