riscv
/
coriolis
mirror of https://gitlab.lip6.fr/vlsi-eda/coriolis.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Python linking issues

This commit is contained in:
Robert Taylor 2022-12-01 22:32:30 +00:00
parent 8dfd522b71
commit cd4f8560ca
25 changed files with 57 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bootstrap/cmake_modules/FindBootstrap.cmake
View File

@ -7,6 +7,9 @@
if(COMMAND CMAKE_POLICY)
cmake_policy(SET CMP0003 NEW)
cmake_policy(SET CMP0005 NEW)
cmake_policy(SET CMP0079 NEW)
cmake_policy(SET CMP0022 NEW)
cmake_policy(SET CMP0060 NEW)
#if(NOT (CMAKE_VERSION VERSION_LESS 2.8.0))
# cmake_policy(SET CMP0014 OLD)
#endif()

2
crlcore/src/LibraryManager/CMakeLists.txt
View File

@ -49,7 +49,7 @@
# ${QtX_LIBRARIES}
# ${Boost_LIBRARIES}
# ${LIBXML2_LIBRARIES}
# ${PYTHON_LIBRARIES} -lutil
# ${Python_LIBRARIES} -lutil
# )
install( TARGETS libmanager DESTINATION lib${LIB_SUFFIX} )

24
crlcore/src/ccore/CMakeLists.txt
View File

@ -303,18 +303,18 @@
${openaccess_cpps}
)
set_target_properties ( crlcore PROPERTIES VERSION 1.0 SOVERSION 1 )
# target_link_libraries ( crlcore ${HURRICANE_PYTHON_NEW_LIBRARIES}
# ${HURRICANE_PYTHON_LIBRARIES}
# ${HURRICANE_GRAPHICAL_LIBRARIES}
# ${HURRICANE_LIBRARIES}
# ${BOOKSHELF_LIBRARY}
# ${LEFDEF_LIBRARIES}
# ${OA_LIBRARIES}
# ${QtX_LIBRARIES}
# ${Boost_LIBRARIES}
# ${LIBXML2_LIBRARIES}
# ${PYTHON_LIBRARIES} -lutil
# )
target_link_libraries ( crlcore ${HURRICANE_PYTHON_NEW_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_LIBRARIES}
${BOOKSHELF_LIBRARY}
${LEFDEF_LIBRARIES}
${OA_LIBRARIES}
${QtX_LIBRARIES}
${Boost_LIBRARIES}
${LIBXML2_LIBRARIES}
${Python_LIBRARIES} -lutil
)
install ( TARGETS crlcore DESTINATION lib${LIB_SUFFIX} )
install ( FILES ${includes} ${mocincludes} DESTINATION include/coriolis2/crlcore )

26
crlcore/src/pyCRL/CMakeLists.txt
View File

@ -21,6 +21,17 @@
${Boost_INCLUDE_DIR}
${QtX_INCLUDE_DIRS}
)
set (LINK_LIBS ${HURRICANE_PYTHON_NEW_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_LIBRARIES}
${BOOKSHELF_LIBRARY}
${OA_LIBRARIES}
${Boost_LIBRARIES}
${LIBXML2_LIBRARIES}
${Python_LIBRARIES} -lutil
)
add_definitions( -DCORIOLIS_TOP="${CORIOLIS_TOP}"
-DSYS_CONF_DIR="${SYS_CONF_DIR}"
@ -77,16 +88,7 @@
crlcore/PyLefExport.h
crlcore/PyDefExport.h
)
# target_link_libraries ( crlcore ${HURRICANE_PYTHON_NEW_LIBRARIES}
# ${HURRICANE_PYTHON_LIBRARIES}
# ${HURRICANE_GRAPHICAL_LIBRARIES}
# ${HURRICANE_LIBRARIES}
# ${BOOKSHELF_LIBRARY}
# ${OA_LIBRARIES}
# ${Boost_LIBRARIES}
# ${LIBXML2_LIBRARIES}
# ${PYTHON_LIBRARIES} -lutil
# )
target_link_libraries ( crlcore ${LINK_LIBS} )
set( depLibs crlcore
${HURRICANE_GRAPHICAL_LIBRARIES}
@ -94,7 +96,7 @@
${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_LIBRARIES}
${LEFDEF_LIBRARIES}
${PYTHON_LIBRARIES}
${Python_LIBRARIES}
${QtX_LIBRARIES}
-lutil
)
@ -106,6 +108,7 @@
"${depLibs}"
include/coriolis2/crlcore
)
add_python_module( "${pyConstCpps}"
"crlcore/PyRoutingLayerGauge.h"
"pycrlconst;1.0;1"
@ -113,3 +116,4 @@
"${depLibs}"
include/coriolis2/crlcore
)

1
crlcore/src/x2y/CMakeLists.txt
View File

@ -26,6 +26,5 @@
${BZIP2_LIBRARIES}
${LIBEXECINFO_LIBRARIES}
${LIBBFD_LIBRARIES}
z
)
install ( TARGETS cx2y DESTINATION bin )

2
deprecated/knik/src/CMakeLists.txt
View File

@ -60,7 +60,7 @@
# ${QtX_LIBRARIES}
# ${Boost_LIBRARIES}
# ${LIBXML2_LIBRARIES}
# ${PYTHON_LIBRARIES} -lutil
# ${Python_LIBRARIES} -lutil
# )
install ( TARGETS knik DESTINATION lib${LIB_SUFFIX} )

2
deprecated/nimbus/src/CMakeLists.txt
View File

@ -57,7 +57,7 @@
# ${QtX_LIBRARIES}
# ${Boost_LIBRARIES}
# ${LIBXML2_LIBRARIES}
# ${PYTHON_LIBRARIES} -lutil
# ${Python_LIBRARIES} -lutil
# )
add_library ( pyNimbus MODULE ${pyCpps} )

4
deprecated/vlsisapd/examples/liberty/cplusplus/CMakeLists.txt
View File

@ -1,7 +1,7 @@
INCLUDE_DIRECTORIES ( ${VLSISAPD_SOURCE_DIR}/src/liberty/src )
ADD_EXECUTABLE ( driveLiberty driveLiberty.cpp )
ADD_EXECUTABLE ( parseLiberty parseLiberty.cpp )
TARGET_LINK_LIBRARIES ( driveLiberty liberty ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} )
TARGET_LINK_LIBRARIES ( parseLiberty liberty ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} )
TARGET_LINK_LIBRARIES ( driveLiberty liberty ${Boost_LIBRARIES} ${Python_LIBRARIES} )
TARGET_LINK_LIBRARIES ( parseLiberty liberty ${Boost_LIBRARIES} ${Python_LIBRARIES} )
INSTALL ( TARGETS driveLiberty DESTINATION share/doc/coriolis2/examples/vlsisapd/liberty )
INSTALL ( TARGETS parseLiberty DESTINATION share/doc/coriolis2/examples/vlsisapd/liberty )

2
deprecated/vlsisapd/src/agds/src/CMakeLists.txt
View File

@ -24,7 +24,7 @@ IF(Boost_FOUND)
OUTPUT_NAME "AGDS"
PREFIX ""
)
TARGET_LINK_LIBRARIES(pyAGDS agds ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
TARGET_LINK_LIBRARIES(pyAGDS agds ${Boost_LIBRARIES} ${Python_LIBRARIES})
INSTALL(TARGETS pyAGDS DESTINATION ${PYTHON_SITE_PACKAGES})
ENDIF(Boost_FOUND)

2
deprecated/vlsisapd/src/bookshelf/src/CMakeLists.txt
View File

@ -27,7 +27,7 @@
#target_link_libraries ( bookshelf vlsisapdutils )
set_target_properties ( bookshelf PROPERTIES VERSION 1.0 SOVERSION 1 )
add_executable ( bookshelf-tk ${testcpps} )
target_link_libraries ( bookshelf-tk bookshelf ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
target_link_libraries ( bookshelf-tk bookshelf ${Boost_LIBRARIES} ${Python_LIBRARIES})
install ( TARGETS bookshelf DESTINATION lib${LIB_SUFFIX} )
install ( TARGETS bookshelf-tk DESTINATION bin )

2
deprecated/vlsisapd/src/cif/src/CMakeLists.txt
View File

@ -21,7 +21,7 @@ IF(Boost_FOUND)
OUTPUT_NAME "CIF"
PREFIX ""
)
TARGET_LINK_LIBRARIES(pyCIF cif ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
TARGET_LINK_LIBRARIES(pyCIF cif ${Boost_LIBRARIES} ${Python_LIBRARIES})
INSTALL(TARGETS pyCIF DESTINATION ${PYTHON_SITE_PACKAGES})
ENDIF(Boost_FOUND)

4
deprecated/vlsisapd/src/configuration/src/CMakeLists.txt
View File

@ -43,7 +43,7 @@
set_target_properties ( configuration PROPERTIES VERSION 1.0 SOVERSION 1 )
#target_link_libraries ( configuration vlsisapdutils
# ${QtX_LIBRARIES}
# ${PYTHON_LIBRARIES}
# ${Python_LIBRARIES}
# ${LIBXML2_LIBRARIES}
# ${Boost_LIBRARIES}
# )
@ -55,7 +55,7 @@
PREFIX ""
)
#target_link_libraries ( pyConfiguration configuration
# ${PYTHON_LIBRARIES}
# ${Python_LIBRARIES}
# ${LIBXML2_LIBRARIES}
# ${Boost_LIBRARIES}
# )

2
deprecated/vlsisapd/src/dtr/src/CMakeLists.txt
View File

@ -22,7 +22,7 @@ IF (Boost_FOUND)
OUTPUT_NAME "DTR"
PREFIX ""
)
TARGET_LINK_LIBRARIES(pyDTR dtr ${LIBXML2_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
TARGET_LINK_LIBRARIES(pyDTR dtr ${LIBXML2_LIBRARIES} ${Boost_LIBRARIES} ${Python_LIBRARIES})
INSTALL(TARGETS pyDTR DESTINATION ${PYTHON_SITE_PACKAGES})
ENDIF(Boost_FOUND)

2
deprecated/vlsisapd/src/liberty/src/CMakeLists.txt
View File

@ -66,6 +66,6 @@ if ( Boost_FOUND )
OUTPUT_NAME "LIBERTY"
PREFIX ""
)
# target_link_libraries ( pyLIBERTY liberty ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} )
# target_link_libraries ( pyLIBERTY liberty ${Boost_LIBRARIES} ${Python_LIBRARIES} )
install ( TARGETS pyLIBERTY DESTINATION ${PYTHON_SITE_PACKAGES} )
endif ( Boost_FOUND )

2
deprecated/vlsisapd/src/spice/src/CMakeLists.txt
View File

@ -27,7 +27,7 @@ IF(Boost_FOUND)
OUTPUT_NAME "SPICE"
PREFIX ""
)
TARGET_LINK_LIBRARIES(pySPICE spice ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
TARGET_LINK_LIBRARIES(pySPICE spice ${Boost_LIBRARIES} ${Python_LIBRARIES})
INSTALL(TARGETS pySPICE DESTINATION ${PYTHON_SITE_PACKAGES})
ENDIF(Boost_FOUND)

2
documentation/examples/code/engine/smurf/src/CMakeLists.txt
View File

@ -44,7 +44,7 @@
${QtX_LIBRARIES}
${Boost_LIBRARIES}
${LIBXML2_LIBRARIES}
${PYTHON_LIBRARIES} -lutil
${Python_LIBRARIES} -lutil
${LIBEXECINFO_LIBRARIES}
)

2
equinox/src/CMakeLists.txt
View File

@ -57,7 +57,7 @@
# ${QtX_LIBRARIES}
# ${Boost_LIBRARIES}
# ${LIBXML2_LIBRARIES}
# ${PYTHON_LIBRARIES} -lutil
# ${Python_LIBRARIES} -lutil
# )
install ( TARGETS equinox intervalTree DESTINATION lib${LIB_SUFFIX} )

3
hurricane/cmake_modules/FindHURRICANE.cmake
View File

@ -137,6 +137,9 @@ IF(UNIX)
SET_LIBRARIES_PATH(HURRICANE_PYTHON_NEW HURRICANE_PYTHON_NEW)
SET_LIBRARIES_PATH(HURRICANE_GRAPHICAL HURRICANE_VIEWER)
set(HURRICANE_PYTHON_INTERFACE_LINK_LIBRARIES "${Boost_LIBRARIES} ${BZIP2_LIBRARIES} ${LIBBFD_LIBRARIES}" )
HURRICANE_CHECK_LIBRARIES(HURRICANE )
HURRICANE_CHECK_LIBRARIES(HURRICANE_PYTHON_NEW ${HURRICANE_FIND_REQUIRED})
HURRICANE_CHECK_LIBRARIES(HURRICANE_PYTHON ${HURRICANE_FIND_REQUIRED})

4
hurricane/src/configuration/CMakeLists.txt
View File

@ -91,14 +91,14 @@
add_python_module3( "${pyCfgCpps}"
"${pyCfgIncludes}"
Cfg
"pytypemanager;configuration;hurricane;${QtX_LIBRARIES};${PYTHON_LIBRARIES}"
"pytypemanager;configuration;hurricane;${QtX_LIBRARIES};${Python_LIBRARIES}"
include/coriolis2/hurricane/configuration
)
add_python_module3( "${pyHurricane3Cpps}"
"${pyHurricane3Includes}"
Hurricane3
"pytypemanager;configuration;hurricane;${PYTHON_LIBRARIES}"
"pytypemanager;configuration;hurricane;${Python_LIBRARIES}"
include/coriolis2/hurricane/configuration
)

2
hurricane/src/isobar/CMakeLists.txt
View File

@ -168,7 +168,7 @@
set( depLibs hurricane
${Boost_LIBRARIES}
${PYTHON_LIBRARIES}
${Python_LIBRARIES}
)
add_python_module( "${pyCpps}"

1
hurricane/src/viewer/CMakeLists.txt
View File

@ -150,6 +150,7 @@
${UTILITIES_LIBRARY}
${LIBXML2_LIBRARIES}
${QtX_LIBRARIES}
${Python_LIBRARIES}
)
add_library( viewer ${cpps} ${MOC_SRCS} ${RCC_SRCS} ${pyCpps} )

2
ispd/src/CMakeLists.txt
View File

@ -33,7 +33,7 @@
${LEFDEF_LIBRARIES}
${QT_LIBRARIES}
${Boost_LIBRARIES}
${PYTHON_LIBRARIES}
${Python_LIBRARIES}
-lutil
${LIBXML2_LIBRARIES}
)

2
mauka/src/CMakeLists.txt
View File

@ -64,7 +64,7 @@
# ${QtX_LIBRARIES}
# ${Boost_LIBRARIES}
# ${LIBXML2_LIBRARIES}
# ${PYTHON_LIBRARIES} -lutil
# ${Python_LIBRARIES} -lutil
# )
add_library ( pyMauka MODULE ${pyCpps} )

2
metis/src/CMakeLists.txt
View File

@ -44,7 +44,7 @@ endif ( HMETIS_FOUND )
# ${QT_LIBRARIES}
# ${Boost_LIBRARIES}
# ${LIBXML2_LIBRARIES}
# ${PYTHON_LIBRARIES} -lutil
# ${Python_LIBRARIES} -lutil
# )
add_library ( pyMetis MODULE ${pyCpps} )

2
solstice/src/CMakeLists.txt
View File

@ -55,7 +55,7 @@
# ${QtX_LIBRARIES}
# ${Boost_LIBRARIES}
# ${LIBXML2_LIBRARIES}
# ${PYTHON_LIBRARIES} -lutil
# ${Python_LIBRARIES} -lutil
# )
install ( TARGETS solstice DESTINATION lib${LIB_SUFFIX} )