Skip to content

Commit

Permalink
Rename cmake path variable TRELLIS_ROOT to TRELLIS_INSTALL_PREFIX
Browse files Browse the repository at this point in the history
  • Loading branch information
se-bi committed Feb 4, 2020
1 parent 1b560ae commit 2c938e0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -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_.

```
cmake -DARCH=ecp5 -DTRELLIS_ROOT=/path/to/prjtrellis .
cmake -DARCH=ecp5 -DTRELLIS_INSTALL_PREFIX=/path/to/prjtrellis .
make -j$(nproc)
sudo make install
```
Expand Down
12 changes: 6 additions & 6 deletions 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")
set(TRELLIS_ROOT "/usr/local")
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}/lib/trellis
PATHS ${TRELLIS_INSTALL_PREFIX}/lib/trellis
PATH_SUFFIXES trellis
DOC "Location of pytrellis library")

Expand All @@ -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}/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()
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()

if (MSVC)
Expand Down

0 comments on commit 2c938e0

Please sign in to comment.