caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Changing the definition of TRELLIS_ROOT to point to root of lib, share containing trellis libs and data

Browse Source 
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
This commit is contained in:
Jared Boone 2019-04-27 09:43:29 -07:00 committed by Sebastian Birke
parent c95b140dec
commit 1b560ae44c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ecp5/family.cmake
View File

@ -2,13 +2,13 @@ if (NOT EXTERNAL_CHIPDB)
set(devices 25k 45k 85k) set(devices 25k 45k 85k)
if (NOT DEFINED TRELLIS_ROOT) if (NOT DEFINED TRELLIS_ROOT)
message(STATUS "TRELLIS_ROOT not defined using -DTRELLIS_ROOT=/path/to/prjtrellis. Default to /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/share/trellis") set(TRELLIS_ROOT "/usr/local")
endif() endif()
if (NOT DEFINED PYTRELLIS_LIBDIR) if (NOT DEFINED PYTRELLIS_LIBDIR)
find_library(PYTRELLIS pytrellis.so find_library(PYTRELLIS pytrellis.so
PATHS ${TRELLIS_ROOT}/libtrellis PATHS ${TRELLIS_ROOT}/lib/trellis
PATH_SUFFIXES trellis PATH_SUFFIXES trellis
DOC "Location of pytrellis library") DOC "Location of pytrellis library")
@ -27,9 +27,9 @@ if (NOT EXTERNAL_CHIPDB)
target_include_directories(ecp5_chipdb PRIVATE ${family}/) target_include_directories(ecp5_chipdb PRIVATE ${family}/)
if (CMAKE_HOST_WIN32) 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() 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() endif()
if (MSVC) if (MSVC)