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

Rename cmake path variable TRELLIS_ROOT to TRELLIS_INSTALL_PREFIX

Browse Source
This commit is contained in:
Sebastian Birke 2020-02-04 18:17:44 +01:00
parent 1b560ae44c
commit 2c938e0e8b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -100,7 +100,7 @@ For ECP5 support, you must download [Project Trellis](https://github.com/SymbiFl
then follow its instructions to download the latest database and build _libtrellis_. then follow its instructions to download the latest database and build _libtrellis_.
``` ```
cmake -DARCH=ecp5 -DTRELLIS_ROOT=/path/to/prjtrellis . cmake -DARCH=ecp5 -DTRELLIS_INSTALL_PREFIX=/path/to/prjtrellis .
make -j$(nproc) make -j$(nproc)
sudo make install sudo make install
``` ```

12
ecp5/family.cmake
View File

@ -1,14 +1,14 @@
if (NOT EXTERNAL_CHIPDB) if (NOT EXTERNAL_CHIPDB)
set(devices 25k 45k 85k) set(devices 25k 45k 85k)
if (NOT DEFINED TRELLIS_ROOT) if (NOT DEFINED TRELLIS_INSTALL_PREFIX)
message(STATUS "TRELLIS_ROOT not defined using -DTRELLIS_ROOT=/path/to/prjtrellis. Default to /usr/local") 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_ROOT "/usr/local") set(TRELLIS_INSTALL_PREFIX "/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}/lib/trellis PATHS ${TRELLIS_INSTALL_PREFIX}/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}/share/trellis/util/common\;${TRELLIS_ROOT}/share/trellis/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() else()
set(ENV_CMD ${CMAKE_COMMAND} -E env "PYTHONPATH=${PYTRELLIS_LIBDIR}\:${TRELLIS_ROOT}/share/trellis/util/common:${TRELLIS_ROOT}/share/trellis/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() endif()
if (MSVC) if (MSVC)