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

Merge pull request #465 from whitequark/fix-trellis-discovery

Browse Source 
Improve Trellis discovery logic
This commit is contained in:
whitequark 2020-07-01 22:02:36 +00:00 committed by GitHub
commit 4a2964c915
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ecp5/CMakeLists.txt
View File

@ -25,15 +25,39 @@ else()
"Trellis install prefix") "Trellis install prefix")
message(STATUS "Trellis install prefix: ${TRELLIS_INSTALL_PREFIX}") message(STATUS "Trellis install prefix: ${TRELLIS_INSTALL_PREFIX}")
if(NOT DEFINED TRELLIS_LIBDIR) if(NOT TRELLIS_LIBDIR)
# The pytrellis library isn't a normal shared library, but rather a native Python library;
# it does not follow the normal platform conventions for shared libraries, so we can't just
# use find_library() here. Instead, we emulate the useful parts of the find_library() logic
# for use with find_path().
set(pytrellis_paths)
foreach(prefix_path ${CMAKE_PREFIX_PATH})
list(APPEND pytrellis_paths ${prefix_path}/lib)
if(CMAKE_LIBRARY_ARCHITECTURE)
list(APPEND pytrellis_paths ${prefix_path}/lib/${CMAKE_LIBRARY_ARCHITECTURE})
endif()
endforeach()
list(APPEND pytrellis_paths ${CMAKE_LIBRARY_PATH})
if(NOT NO_CMAKE_SYSTEM_PATH)
foreach(prefix_path ${CMAKE_SYSTEM_PREFIX_PATH})
list(APPEND pytrellis_paths ${prefix_path}/lib)
if(CMAKE_LIBRARY_ARCHITECTURE)
list(APPEND pytrellis_paths ${prefix_path}/lib/${CMAKE_LIBRARY_ARCHITECTURE})
endif()
endforeach()
list(APPEND pytrellis_paths ${CMAKE_SYSTEM_LIBRARY_PATH})
endif()
message(STATUS "Searching for pytrellis in: ${pytrellis_paths}")
if(WIN32) if(WIN32)
set(pytrellis_lib pytrellis.pyd) set(pytrellis_lib pytrellis.pyd)
else() else()
set(pytrellis_lib pytrellis${CMAKE_SHARED_LIBRARY_SUFFIX}) set(pytrellis_lib pytrellis${CMAKE_SHARED_LIBRARY_SUFFIX})
endif() endif()
find_path(TRELLIS_LIBDIR ${pytrellis_lib} find_path(TRELLIS_LIBDIR ${pytrellis_lib}
HINTS ${TRELLIS_INSTALL_PREFIX}/lib/${TRELLIS_PROGRAM_PREFIX}trellis HINTS ${TRELLIS_INSTALL_PREFIX}/lib/${TRELLIS_PROGRAM_PREFIX}trellis
PATHS ${CMAKE_SYSTEM_LIBRARY_PATH} ${CMAKE_LIBRARY_PATH} PATHS ${pytrellis_paths}
PATH_SUFFIXES ${TRELLIS_PROGRAM_PREFIX}trellis PATH_SUFFIXES ${TRELLIS_PROGRAM_PREFIX}trellis
DOC "Location of the pytrellis library") DOC "Location of the pytrellis library")
if(NOT TRELLIS_LIBDIR) if(NOT TRELLIS_LIBDIR)
@ -42,7 +66,7 @@ else()
endif() endif()
message(STATUS "Trellis library directory: ${TRELLIS_LIBDIR}") message(STATUS "Trellis library directory: ${TRELLIS_LIBDIR}")
if(NOT DEFINED TRELLIS_DATADIR) if(NOT TRELLIS_DATADIR)
set(TRELLIS_DATADIR ${TRELLIS_INSTALL_PREFIX}/share/${TRELLIS_PROGRAM_PREFIX}trellis) set(TRELLIS_DATADIR ${TRELLIS_INSTALL_PREFIX}/share/${TRELLIS_PROGRAM_PREFIX}trellis)
endif() endif()
message(STATUS "Trellis data directory: ${TRELLIS_DATADIR}") message(STATUS "Trellis data directory: ${TRELLIS_DATADIR}")

2
ice40/CMakeLists.txt
View File

@ -27,7 +27,7 @@ else()
"IceStorm install prefix") "IceStorm install prefix")
message(STATUS "IceStorm install prefix: ${ICESTORM_INSTALL_PREFIX}") message(STATUS "IceStorm install prefix: ${ICESTORM_INSTALL_PREFIX}")
if(NOT DEFINED ICEBOX_DATADIR) if(NOT ICEBOX_DATADIR)
set(ICEBOX_DATADIR ${ICESTORM_INSTALL_PREFIX}/share/icebox) set(ICEBOX_DATADIR ${ICESTORM_INSTALL_PREFIX}/share/icebox)
endif() endif()
message(STATUS "icebox data directory: ${ICEBOX_DATADIR}") message(STATUS "icebox data directory: ${ICEBOX_DATADIR}")