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

Merge pull request #392 from se-bi/fix/ecp5/cmake-paths

Browse Source 
Fix paths to prjtrellies project
This commit is contained in:
David Shah 2020-02-04 18:38:17 +00:00 committed by GitHub
commit ca73356187
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

@ -5,7 +5,7 @@ task:
memory: 20 memory: 20
dockerfile: .cirrus/Dockerfile.ubuntu16.04 dockerfile: .cirrus/Dockerfile.ubuntu16.04
build_script: mkdir build && cd build && cmake .. -DARCH=all -DTRELLIS_ROOT=/usr/local/src/prjtrellis -DBUILD_TESTS=on && make -j $(nproc) build_script: mkdir build && cd build && cmake .. -DARCH=all -DBUILD_TESTS=on && make -j $(nproc)
submodule_script: git submodule sync --recursive && git submodule update --init --recursive submodule_script: git submodule sync --recursive && git submodule update --init --recursive
test_generic_script: cd build && ./nextpnr-generic-test test_generic_script: cd build && ./nextpnr-generic-test
test_ice40_script: cd build && ./nextpnr-ice40-test test_ice40_script: cd build && ./nextpnr-ice40-test

4
.cirrus/Dockerfile.ubuntu16.04
View File

@ -47,8 +47,8 @@ RUN set -e -x ;\
cd /usr/local/src ;\ cd /usr/local/src ;\
git clone --recursive https://github.com/SymbiFlow/prjtrellis.git ;\ git clone --recursive https://github.com/SymbiFlow/prjtrellis.git ;\
cd prjtrellis ;\ cd prjtrellis ;\
git reset --hard 46e95314be7f8850db80ad1ef6b3359b091fad93 ;\ git reset --hard 668ce3492cbe1566c61760f06bdf676f6fb265c3 ;\
cd libtrellis ;\ cd libtrellis ;\
cmake -DCMAKE_INSTALL_PREFIX=/usr . ;\ cmake . ;\
make -j $(nproc) ;\ make -j $(nproc) ;\
make install make install

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/share/trellis") 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/share/trellis") 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}/libtrellis 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}/util/common\;${TRELLIS_ROOT}/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}/util/common:${TRELLIS_ROOT}/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)