From a02c88a893fe341c96b051f9048265bed0c01107 Mon Sep 17 00:00:00 2001 From: Robert Taylor Date: Thu, 15 Dec 2022 00:37:06 +0000 Subject: [PATCH] Don't link libpython, it isn't there in manylinux --- Seabreeze/CMakeLists.txt | 2 +- Seabreeze/src/CMakeLists.txt | 2 +- anabatic/CMakeLists.txt | 2 +- anabatic/src/CMakeLists.txt | 2 +- bootstrap/CMakeLists.txt | 2 +- bootstrap/cmake_modules/FindBootstrap.cmake | 17 ++++++++++++++--- bora/CMakeLists.txt | 2 +- bora/src/CMakeLists.txt | 2 +- coloquinte/CMakeLists.txt | 2 +- crlcore/CMakeLists.txt | 2 +- crlcore/src/LibraryManager/CMakeLists.txt | 2 +- crlcore/src/ccore/CMakeLists.txt | 2 +- crlcore/src/cyclop/CMakeLists.txt | 3 ++- crlcore/src/pyCRL/CMakeLists.txt | 3 +-- crlcore/src/x2y/CMakeLists.txt | 4 +++- cumulus/CMakeLists.txt | 2 +- deprecated/katabatic/CMakeLists.txt | 2 +- deprecated/katabatic/src/CMakeLists.txt | 2 +- deprecated/kite/CMakeLists.txt | 2 +- deprecated/kite/src/CMakeLists.txt | 2 +- deprecated/knik/CMakeLists.txt | 2 +- deprecated/knik/src/CMakeLists.txt | 2 +- deprecated/nimbus/CMakeLists.txt | 2 +- deprecated/nimbus/src/CMakeLists.txt | 2 +- deprecated/vlsisapd/CMakeLists.txt | 2 +- .../examples/liberty/cplusplus/CMakeLists.txt | 4 ++-- deprecated/vlsisapd/src/agds/src/CMakeLists.txt | 2 +- .../vlsisapd/src/bookshelf/src/CMakeLists.txt | 2 +- deprecated/vlsisapd/src/cif/src/CMakeLists.txt | 2 +- .../src/configuration/src/CMakeLists.txt | 4 ++-- deprecated/vlsisapd/src/dtr/src/CMakeLists.txt | 2 +- .../vlsisapd/src/liberty/src/CMakeLists.txt | 2 +- .../vlsisapd/src/spice/src/CMakeLists.txt | 2 +- documentation/CMakeLists.txt | 2 +- .../examples/code/engine/smurf/CMakeLists.txt | 2 +- .../code/engine/smurf/src/CMakeLists.txt | 2 +- equinox/CMakeLists.txt | 2 +- equinox/src/CMakeLists.txt | 2 +- etesian/CMakeLists.txt | 2 +- etesian/src/CMakeLists.txt | 2 +- flute/CMakeLists.txt | 2 +- flute/src/3.1/CMakeLists.txt | 2 +- foehn/CMakeLists.txt | 2 +- foehn/src/CMakeLists.txt | 2 +- hurricane/CMakeLists.txt | 2 +- hurricane/cmake_modules/FindHURRICANE.cmake | 6 +++++- hurricane/src/configuration/CMakeLists.txt | 4 ++-- hurricane/src/isobar/CMakeLists.txt | 2 +- hurricane/src/viewer/CMakeLists.txt | 2 +- ispd/CMakeLists.txt | 2 +- ispd/src/CMakeLists.txt | 2 +- karakaze/CMakeLists.txt | 2 +- katana/CMakeLists.txt | 2 +- katana/src/CMakeLists.txt | 2 +- lefdef/CMakeLists.txt | 2 +- mauka/CMakeLists.txt | 2 +- mauka/src/CMakeLists.txt | 2 +- metis/CMakeLists.txt | 2 +- metis/src/CMakeLists.txt | 2 +- oroshi/CMakeLists.txt | 2 +- pyproject.toml | 2 +- solstice/CMakeLists.txt | 2 +- solstice/src/CMakeLists.txt | 2 +- stratus1/CMakeLists.txt | 2 +- tutorial/CMakeLists.txt | 2 +- tutorial/src/CMakeLists.txt | 2 +- unicorn/CMakeLists.txt | 2 +- unicorn/src/CMakeLists.txt | 2 +- unittests/CMakeLists.txt | 2 +- unittests/src/CMakeLists.txt | 2 +- 70 files changed, 93 insertions(+), 76 deletions(-) diff --git a/Seabreeze/CMakeLists.txt b/Seabreeze/CMakeLists.txt index 78c06c11..185a1b76 100644 --- a/Seabreeze/CMakeLists.txt +++ b/Seabreeze/CMakeLists.txt @@ -7,7 +7,7 @@ option(CHECK_DATABASE "Run database in full check mode (very slow)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") diff --git a/Seabreeze/src/CMakeLists.txt b/Seabreeze/src/CMakeLists.txt index 8998ee8b..3b51d16f 100644 --- a/Seabreeze/src/CMakeLists.txt +++ b/Seabreeze/src/CMakeLists.txt @@ -50,7 +50,7 @@ ${QtX_LIBRARIES} ${Boost_LIBRARIES} ${LIBXML2_LIBRARIES} - ${Python_LIBRARIES} -lutil + -lutil ${LIBEXECINFO_LIBRARIES} ) diff --git a/anabatic/CMakeLists.txt b/anabatic/CMakeLists.txt index 2bb1c8b4..cd4f87de 100644 --- a/anabatic/CMakeLists.txt +++ b/anabatic/CMakeLists.txt @@ -9,7 +9,7 @@ option(CHECK_DATABASE "Run database in full check mode (very slow)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) diff --git a/anabatic/src/CMakeLists.txt b/anabatic/src/CMakeLists.txt index 01266311..a25523e3 100644 --- a/anabatic/src/CMakeLists.txt +++ b/anabatic/src/CMakeLists.txt @@ -90,7 +90,7 @@ endif ( CHECK_DETERMINISM ) ${QtX_LIBRARIES} ${Boost_LIBRARIES} ${LIBXML2_LIBRARIES} - ${Python_LIBRARIES} -lutil + -lutil ) add_library( anabatic ${cpps} ) diff --git a/bootstrap/CMakeLists.txt b/bootstrap/CMakeLists.txt index b1e1c543..aa8d1b2b 100644 --- a/bootstrap/CMakeLists.txt +++ b/bootstrap/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(Bootstrap) - cmake_minimum_required(VERSION 2.8.0) + cmake_minimum_required(VERSION 3.18) set(ignoreVariables USE_LIBBFD "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") diff --git a/bootstrap/cmake_modules/FindBootstrap.cmake b/bootstrap/cmake_modules/FindBootstrap.cmake index d0a50310..010d7093 100644 --- a/bootstrap/cmake_modules/FindBootstrap.cmake +++ b/bootstrap/cmake_modules/FindBootstrap.cmake @@ -135,7 +135,7 @@ # Build _INCLUDE_DIR & _LIBRARIES and sets up _FOUND # Usage: set_library_path( ) # -# May be used any number of time on the same to create a list of +#PYTHON_NEW May be used any number of time on the same to create a list of # . # macro(set_libraries_path configname library) @@ -152,7 +152,14 @@ set(${configname}_FOUND "NOTFOUND") endif() endmacro() - +# +# sets that a library is expected to have unresolved symbols +# Usage: set_library_unresolved_symbols() +# +# Should be used before set_libraries_path. + macro(set_has_unresolved_symbols configname) + set(${configname}_LIBRARIES "-Wl,--unresolved-symbols=ignore-in-shared-libs" ${${configname}_LIBRARIES}) + endmacro() # # Checks if a set of libraries has been found, could be blocking or not. @@ -400,9 +407,11 @@ set( pyDeplibs ${clib} ${deplibs} ) add_library( ${clib} ${pyCpps} ) - set_target_properties( ${clib} PROPERTIES VERSION ${version} SOVERSION ${soversion} ) + set_target_properties( ${clib} PROPERTIES VERSION ${version} SOVERSION ${soversion}) + #target_compile_definitions( ${clib} PUBLIC Py_LIMITED_API=1) target_link_libraries( ${clib} ${deplibs} ) install( TARGETS ${clib} DESTINATION lib${LIB_SUFFIX} ) + target_link_options( ${clib} PRIVATE "LINKER:--unresolved-symbols=ignore-in-object-files") endif() set( pytarget "${pymodule}_target" ) @@ -413,6 +422,7 @@ PREFIX "" OUTPUT_NAME ${pymodule} ) + #target_compile_definitions( ${pytarget} PUBLIC Py_LIMITED_API=1) target_link_libraries( ${pytarget} ${pyDeplibs} ) install( TARGETS ${pytarget} DESTINATION ${Python_CORIOLISARCH} ) @@ -436,6 +446,7 @@ add_library( ${pymodule} MODULE ${pyCpps} ) set_target_properties( ${pymodule} PROPERTIES PREFIX "" ) target_link_libraries( ${pymodule} ${deplibs} ) + # target_compile_definitions( ${pymodule} PUBLIC Py_LIMITED_API=1) install( TARGETS ${pymodule} DESTINATION ${Python_CORIOLISARCH} ) if( NOT ("${pyIncludes}" STREQUAL "None") ) diff --git a/bora/CMakeLists.txt b/bora/CMakeLists.txt index f7555857..c19788b0 100644 --- a/bora/CMakeLists.txt +++ b/bora/CMakeLists.txt @@ -6,7 +6,7 @@ option(BUILD_DOC "Build the documentation (doxygen)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") diff --git a/bora/src/CMakeLists.txt b/bora/src/CMakeLists.txt index 36b86101..ef64c135 100644 --- a/bora/src/CMakeLists.txt +++ b/bora/src/CMakeLists.txt @@ -101,7 +101,7 @@ ${QWT_LIBRARY} ${QtX_LIBRARIES} ${Boost_LIBRARIES} - ${Python_LIBRARIES} -lutil + -lutil ) add_library( bora ${cpps} ${mocCpps} ${pyCpps} ) diff --git a/coloquinte/CMakeLists.txt b/coloquinte/CMakeLists.txt index 60d6bf7a..32166426 100644 --- a/coloquinte/CMakeLists.txt +++ b/coloquinte/CMakeLists.txt @@ -8,7 +8,7 @@ #option(BUILD_DOC "Build the documentation (doxygen)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) diff --git a/crlcore/CMakeLists.txt b/crlcore/CMakeLists.txt index 00e82ed1..e3a5a7aa 100644 --- a/crlcore/CMakeLists.txt +++ b/crlcore/CMakeLists.txt @@ -5,7 +5,7 @@ set(ignoreVariables "${CMAKE_INSTALL_DIR}") - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) OPTION(BUILD_DOC "Build the documentation (latex+doxygen)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) diff --git a/crlcore/src/LibraryManager/CMakeLists.txt b/crlcore/src/LibraryManager/CMakeLists.txt index 759e7d71..138cfd30 100644 --- a/crlcore/src/LibraryManager/CMakeLists.txt +++ b/crlcore/src/LibraryManager/CMakeLists.txt @@ -49,7 +49,7 @@ ${QtX_LIBRARIES} ${Boost_LIBRARIES} ${LIBXML2_LIBRARIES} - ${Python_LIBRARIES} -lutil + -lutil ) install( TARGETS libmanager DESTINATION lib${LIB_SUFFIX} ) diff --git a/crlcore/src/ccore/CMakeLists.txt b/crlcore/src/ccore/CMakeLists.txt index 858d040b..8eddd29d 100644 --- a/crlcore/src/ccore/CMakeLists.txt +++ b/crlcore/src/ccore/CMakeLists.txt @@ -313,7 +313,7 @@ ${QtX_LIBRARIES} ${Boost_LIBRARIES} ${LIBXML2_LIBRARIES} - ${Python_LIBRARIES} -lutil + -lutil ) install ( TARGETS crlcore DESTINATION lib${LIB_SUFFIX} ) diff --git a/crlcore/src/cyclop/CMakeLists.txt b/crlcore/src/cyclop/CMakeLists.txt index 15613590..438233a0 100644 --- a/crlcore/src/cyclop/CMakeLists.txt +++ b/crlcore/src/cyclop/CMakeLists.txt @@ -1,5 +1,6 @@ # -*- explicit-buffer-name: "CMakeLists.txt" -*- + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) include_directories ( ${CRLCORE_SOURCE_DIR}/src/ccore ${HURRICANE_INCLUDE_DIR} ${UTILITIES_INCLUDE_DIR} @@ -31,7 +32,7 @@ ${OA_LIBRARIES} ${QtX_LIBRARIES} ${Boost_LIBRARIES} - ${Python_LIBRARIES} + ${Python_LIBRARIES} -lutil ${LIBXML2_LIBRARIES} ${BZIP2_LIBRARIES} diff --git a/crlcore/src/pyCRL/CMakeLists.txt b/crlcore/src/pyCRL/CMakeLists.txt index 51e2c845..bb7f1d11 100644 --- a/crlcore/src/pyCRL/CMakeLists.txt +++ b/crlcore/src/pyCRL/CMakeLists.txt @@ -29,7 +29,7 @@ ${OA_LIBRARIES} ${Boost_LIBRARIES} ${LIBXML2_LIBRARIES} - ${Python_LIBRARIES} -lutil + -lutil ) @@ -96,7 +96,6 @@ ${HURRICANE_PYTHON_LIBRARIES} ${HURRICANE_LIBRARIES} ${LEFDEF_LIBRARIES} - ${Python_LIBRARIES} ${QtX_LIBRARIES} -lutil ) diff --git a/crlcore/src/x2y/CMakeLists.txt b/crlcore/src/x2y/CMakeLists.txt index 60807fd7..7a7538b2 100644 --- a/crlcore/src/x2y/CMakeLists.txt +++ b/crlcore/src/x2y/CMakeLists.txt @@ -1,5 +1,7 @@ # -*- explicit-buffer-name: "CMakeLists.txt -*- + + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) include_directories ( ${CRLCORE_SOURCE_DIR}/src/ccore ${HURRICANE_INCLUDE_DIR} ${UTILITIES_INCLUDE_DIR} @@ -20,7 +22,7 @@ ${OA_LIBRARIES} ${QtX_LIBRARIES} ${Boost_LIBRARIES} - ${Python_LIBRARIES} + ${Python_LIBRARIES} -lutil ${LIBXML2_LIBRARIES} ${BZIP2_LIBRARIES} diff --git a/cumulus/CMakeLists.txt b/cumulus/CMakeLists.txt index 0b9c327c..5a242426 100644 --- a/cumulus/CMakeLists.txt +++ b/cumulus/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(CUMULUS) - cmake_minimum_required(VERSION 2.8.0) + cmake_minimum_required(VERSION 3.18) set(ignoreVariables "${BUILD_DOC}" "${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) diff --git a/deprecated/katabatic/CMakeLists.txt b/deprecated/katabatic/CMakeLists.txt index f0a2c54b..cd07814c 100644 --- a/deprecated/katabatic/CMakeLists.txt +++ b/deprecated/katabatic/CMakeLists.txt @@ -7,7 +7,7 @@ option(CHECK_DATABASE "Run database in full check mode (very slow)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) set(ignoreVariables "${CMAKE_INSTALL_DIR}") diff --git a/deprecated/katabatic/src/CMakeLists.txt b/deprecated/katabatic/src/CMakeLists.txt index 408499a8..3231aa22 100644 --- a/deprecated/katabatic/src/CMakeLists.txt +++ b/deprecated/katabatic/src/CMakeLists.txt @@ -73,7 +73,7 @@ endif ( CHECK_DETERMINISM ) ${QtX_LIBRARIES} ${Boost_LIBRARIES} ${LIBXML2_LIBRARIES} - ${Python_LIBRARIES} -lutil + -lutil ) add_library( katabatic ${cpps} ) diff --git a/deprecated/kite/CMakeLists.txt b/deprecated/kite/CMakeLists.txt index f3dfa321..650afd46 100644 --- a/deprecated/kite/CMakeLists.txt +++ b/deprecated/kite/CMakeLists.txt @@ -7,7 +7,7 @@ option(CHECK_DATABASE "Run database in full check mode (very slow)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) set(ignoreVariables "${CMAKE_INSTALL_DIR}") diff --git a/deprecated/kite/src/CMakeLists.txt b/deprecated/kite/src/CMakeLists.txt index 3e542381..d8f583da 100644 --- a/deprecated/kite/src/CMakeLists.txt +++ b/deprecated/kite/src/CMakeLists.txt @@ -94,7 +94,7 @@ ${QtX_LIBRARIES} ${Boost_LIBRARIES} ${LIBXML2_LIBRARIES} - ${Python_LIBRARIES} -lutil + -lutil ${LIBEXECINFO_LIBRARIES} ) diff --git a/deprecated/knik/CMakeLists.txt b/deprecated/knik/CMakeLists.txt index caea467d..06c4a660 100644 --- a/deprecated/knik/CMakeLists.txt +++ b/deprecated/knik/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(KNIK) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) diff --git a/deprecated/knik/src/CMakeLists.txt b/deprecated/knik/src/CMakeLists.txt index 041c7e29..467aff85 100644 --- a/deprecated/knik/src/CMakeLists.txt +++ b/deprecated/knik/src/CMakeLists.txt @@ -60,7 +60,7 @@ ${QtX_LIBRARIES} ${Boost_LIBRARIES} ${LIBXML2_LIBRARIES} - ${Python_LIBRARIES} -lutil + -lutil ) install ( TARGETS knik DESTINATION lib${LIB_SUFFIX} ) diff --git a/deprecated/nimbus/CMakeLists.txt b/deprecated/nimbus/CMakeLists.txt index aaedfdd6..deaac46b 100644 --- a/deprecated/nimbus/CMakeLists.txt +++ b/deprecated/nimbus/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(NIMBUS) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") diff --git a/deprecated/nimbus/src/CMakeLists.txt b/deprecated/nimbus/src/CMakeLists.txt index a7d80acb..bd3d2aa7 100644 --- a/deprecated/nimbus/src/CMakeLists.txt +++ b/deprecated/nimbus/src/CMakeLists.txt @@ -57,7 +57,7 @@ ${QtX_LIBRARIES} ${Boost_LIBRARIES} ${LIBXML2_LIBRARIES} - ${Python_LIBRARIES} -lutil + -lutil ) add_library ( pyNimbus MODULE ${pyCpps} ) diff --git a/deprecated/vlsisapd/CMakeLists.txt b/deprecated/vlsisapd/CMakeLists.txt index 71da9818..f2fc39f6 100644 --- a/deprecated/vlsisapd/CMakeLists.txt +++ b/deprecated/vlsisapd/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(VLSISAPD) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) set(ignoreVariables "${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) diff --git a/deprecated/vlsisapd/examples/liberty/cplusplus/CMakeLists.txt b/deprecated/vlsisapd/examples/liberty/cplusplus/CMakeLists.txt index 808e5010..0c66faec 100644 --- a/deprecated/vlsisapd/examples/liberty/cplusplus/CMakeLists.txt +++ b/deprecated/vlsisapd/examples/liberty/cplusplus/CMakeLists.txt @@ -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} ) +TARGET_LINK_LIBRARIES ( parseLiberty liberty ${Boost_LIBRARIES} ) INSTALL ( TARGETS driveLiberty DESTINATION share/doc/coriolis2/examples/vlsisapd/liberty ) INSTALL ( TARGETS parseLiberty DESTINATION share/doc/coriolis2/examples/vlsisapd/liberty ) diff --git a/deprecated/vlsisapd/src/agds/src/CMakeLists.txt b/deprecated/vlsisapd/src/agds/src/CMakeLists.txt index bb90f9fc..e9c9565a 100644 --- a/deprecated/vlsisapd/src/agds/src/CMakeLists.txt +++ b/deprecated/vlsisapd/src/agds/src/CMakeLists.txt @@ -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} ) INSTALL(TARGETS pyAGDS DESTINATION ${PYTHON_SITE_PACKAGES}) ENDIF(Boost_FOUND) diff --git a/deprecated/vlsisapd/src/bookshelf/src/CMakeLists.txt b/deprecated/vlsisapd/src/bookshelf/src/CMakeLists.txt index d357a111..f17f00b8 100644 --- a/deprecated/vlsisapd/src/bookshelf/src/CMakeLists.txt +++ b/deprecated/vlsisapd/src/bookshelf/src/CMakeLists.txt @@ -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} ) install ( TARGETS bookshelf DESTINATION lib${LIB_SUFFIX} ) install ( TARGETS bookshelf-tk DESTINATION bin ) diff --git a/deprecated/vlsisapd/src/cif/src/CMakeLists.txt b/deprecated/vlsisapd/src/cif/src/CMakeLists.txt index ebd42a2a..3e13ede9 100644 --- a/deprecated/vlsisapd/src/cif/src/CMakeLists.txt +++ b/deprecated/vlsisapd/src/cif/src/CMakeLists.txt @@ -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} ) INSTALL(TARGETS pyCIF DESTINATION ${PYTHON_SITE_PACKAGES}) ENDIF(Boost_FOUND) diff --git a/deprecated/vlsisapd/src/configuration/src/CMakeLists.txt b/deprecated/vlsisapd/src/configuration/src/CMakeLists.txt index 861d3382..ba7b5b29 100644 --- a/deprecated/vlsisapd/src/configuration/src/CMakeLists.txt +++ b/deprecated/vlsisapd/src/configuration/src/CMakeLists.txt @@ -43,7 +43,7 @@ set_target_properties ( configuration PROPERTIES VERSION 1.0 SOVERSION 1 ) target_link_libraries ( configuration vlsisapdutils ${QtX_LIBRARIES} - ${Python_LIBRARIES} + ${LIBXML2_LIBRARIES} ${Boost_LIBRARIES} ) @@ -55,7 +55,7 @@ PREFIX "" ) target_link_libraries ( pyConfiguration configuration - ${Python_LIBRARIES} + ${LIBXML2_LIBRARIES} ${Boost_LIBRARIES} ) diff --git a/deprecated/vlsisapd/src/dtr/src/CMakeLists.txt b/deprecated/vlsisapd/src/dtr/src/CMakeLists.txt index 23c16e06..da104f41 100644 --- a/deprecated/vlsisapd/src/dtr/src/CMakeLists.txt +++ b/deprecated/vlsisapd/src/dtr/src/CMakeLists.txt @@ -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} ) INSTALL(TARGETS pyDTR DESTINATION ${PYTHON_SITE_PACKAGES}) ENDIF(Boost_FOUND) diff --git a/deprecated/vlsisapd/src/liberty/src/CMakeLists.txt b/deprecated/vlsisapd/src/liberty/src/CMakeLists.txt index 0a69f78e..76cf041d 100644 --- a/deprecated/vlsisapd/src/liberty/src/CMakeLists.txt +++ b/deprecated/vlsisapd/src/liberty/src/CMakeLists.txt @@ -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} ) install ( TARGETS pyLIBERTY DESTINATION ${PYTHON_SITE_PACKAGES} ) endif ( Boost_FOUND ) diff --git a/deprecated/vlsisapd/src/spice/src/CMakeLists.txt b/deprecated/vlsisapd/src/spice/src/CMakeLists.txt index 53681466..1352e853 100644 --- a/deprecated/vlsisapd/src/spice/src/CMakeLists.txt +++ b/deprecated/vlsisapd/src/spice/src/CMakeLists.txt @@ -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} ) INSTALL(TARGETS pySPICE DESTINATION ${PYTHON_SITE_PACKAGES}) ENDIF(Boost_FOUND) diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt index 7b6032e3..275d6efa 100644 --- a/documentation/CMakeLists.txt +++ b/documentation/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(DOCUMENTATION) - cmake_minimum_required(VERSION 2.4.0) + cmake_minimum_required(VERSION 3.18) set(ignoreVariables "${LIB_SUFFIX} ${CMAKE_INSTALL_DIR}") diff --git a/documentation/examples/code/engine/smurf/CMakeLists.txt b/documentation/examples/code/engine/smurf/CMakeLists.txt index 3fe4bf40..3575461f 100644 --- a/documentation/examples/code/engine/smurf/CMakeLists.txt +++ b/documentation/examples/code/engine/smurf/CMakeLists.txt @@ -4,7 +4,7 @@ option(BUILD_DOC "Build the documentation (doxygen)" OFF) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) diff --git a/documentation/examples/code/engine/smurf/src/CMakeLists.txt b/documentation/examples/code/engine/smurf/src/CMakeLists.txt index d639c630..91a7ac56 100644 --- a/documentation/examples/code/engine/smurf/src/CMakeLists.txt +++ b/documentation/examples/code/engine/smurf/src/CMakeLists.txt @@ -44,7 +44,7 @@ ${QtX_LIBRARIES} ${Boost_LIBRARIES} ${LIBXML2_LIBRARIES} - ${Python_LIBRARIES} -lutil + -lutil ${LIBEXECINFO_LIBRARIES} ) diff --git a/equinox/CMakeLists.txt b/equinox/CMakeLists.txt index 44788760..8ad3ff24 100644 --- a/equinox/CMakeLists.txt +++ b/equinox/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(EQUINOX) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) diff --git a/equinox/src/CMakeLists.txt b/equinox/src/CMakeLists.txt index 9f35f2f6..faebd7df 100644 --- a/equinox/src/CMakeLists.txt +++ b/equinox/src/CMakeLists.txt @@ -57,7 +57,7 @@ ${QtX_LIBRARIES} ${Boost_LIBRARIES} ${LIBXML2_LIBRARIES} - ${Python_LIBRARIES} -lutil + -lutil ) install ( TARGETS equinox intervalTree DESTINATION lib${LIB_SUFFIX} ) diff --git a/etesian/CMakeLists.txt b/etesian/CMakeLists.txt index a859a644..f06850bc 100644 --- a/etesian/CMakeLists.txt +++ b/etesian/CMakeLists.txt @@ -8,7 +8,7 @@ #option(BUILD_DOC "Build the documentation (doxygen)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) diff --git a/etesian/src/CMakeLists.txt b/etesian/src/CMakeLists.txt index cde53f53..2ec6e495 100644 --- a/etesian/src/CMakeLists.txt +++ b/etesian/src/CMakeLists.txt @@ -58,7 +58,7 @@ ${QtX_LIBRARIES} ${Boost_LIBRARIES} ${LIBXML2_LIBRARIES} - ${Python_LIBRARIES} -lutil + -lutil ${LIBEXECINFO_LIBRARIES} ) diff --git a/flute/CMakeLists.txt b/flute/CMakeLists.txt index 61da4ea1..fd765b09 100644 --- a/flute/CMakeLists.txt +++ b/flute/CMakeLists.txt @@ -3,7 +3,7 @@ set( CMAKE_LEGACY_CYGWIN_WIN32 0 ) project( FLUTE ) - cmake_minimum_required( VERSION 2.8.9 ) + cmake_minimum_required(VERSION 3.18) set( ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}" ) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) diff --git a/flute/src/3.1/CMakeLists.txt b/flute/src/3.1/CMakeLists.txt index da1b484d..abb9d809 100644 --- a/flute/src/3.1/CMakeLists.txt +++ b/flute/src/3.1/CMakeLists.txt @@ -32,7 +32,7 @@ ${CORIOLIS_LIBRARIES} ${HURRICANE_PYTHON_LIBRARIES} ${UTILITIES_LIBRARY} - ${Python_LIBRARIES} + -lutil ) diff --git a/foehn/CMakeLists.txt b/foehn/CMakeLists.txt index e679786a..df180724 100644 --- a/foehn/CMakeLists.txt +++ b/foehn/CMakeLists.txt @@ -7,7 +7,7 @@ option(CHECK_DATABASE "Run database in full check mode (very slow)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") diff --git a/foehn/src/CMakeLists.txt b/foehn/src/CMakeLists.txt index 2284640c..bee65a06 100644 --- a/foehn/src/CMakeLists.txt +++ b/foehn/src/CMakeLists.txt @@ -44,7 +44,7 @@ ${QtX_LIBRARIES} ${Boost_LIBRARIES} ${LIBXML2_LIBRARIES} - ${Python_LIBRARIES} -lutil + -lutil ) add_library( foehn ${cpps} ) diff --git a/hurricane/CMakeLists.txt b/hurricane/CMakeLists.txt index 8b582fc0..1d61071f 100644 --- a/hurricane/CMakeLists.txt +++ b/hurricane/CMakeLists.txt @@ -8,7 +8,7 @@ option(BUILD_DOC "Build the documentation (doxygen)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules") find_package(RapidJSON REQUIRED) diff --git a/hurricane/cmake_modules/FindHURRICANE.cmake b/hurricane/cmake_modules/FindHURRICANE.cmake index cf0aba55..021ddded 100644 --- a/hurricane/cmake_modules/FindHURRICANE.cmake +++ b/hurricane/cmake_modules/FindHURRICANE.cmake @@ -129,6 +129,11 @@ IF(UNIX) DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" ) + set_has_unresolved_symbols(HURRICANE_ANALOG) + set_has_unresolved_symbols(HURRICANE_PYTHON) + set_has_unresolved_symbols(HURRICANE_PYTHON_NEW) + set_has_unresolved_symbols(HURRICANE_VIEWER) + SET_LIBRARIES_PATH(HURRICANE HURRICANE_CONFIGURATION) SET_LIBRARIES_PATH(HURRICANE HURRICANE_UTILITIES) SET_LIBRARIES_PATH(HURRICANE HURRICANE) @@ -139,7 +144,6 @@ IF(UNIX) 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}) diff --git a/hurricane/src/configuration/CMakeLists.txt b/hurricane/src/configuration/CMakeLists.txt index 718c6d3a..4c941fbc 100644 --- a/hurricane/src/configuration/CMakeLists.txt +++ b/hurricane/src/configuration/CMakeLists.txt @@ -91,14 +91,14 @@ add_python_module3( "${pyCfgCpps}" "${pyCfgIncludes}" Cfg - "pytypemanager;configuration;hurricane;${QtX_LIBRARIES};${Python_LIBRARIES}" + "pytypemanager;configuration;hurricane;${QtX_LIBRARIES};" include/coriolis2/hurricane/configuration ) add_python_module3( "${pyHurricane3Cpps}" "${pyHurricane3Includes}" Hurricane3 - "pytypemanager;configuration;hurricane;${Python_LIBRARIES}" + "pytypemanager;configuration;hurricane;" include/coriolis2/hurricane/configuration ) diff --git a/hurricane/src/isobar/CMakeLists.txt b/hurricane/src/isobar/CMakeLists.txt index a1ee8cbb..109e0f6b 100644 --- a/hurricane/src/isobar/CMakeLists.txt +++ b/hurricane/src/isobar/CMakeLists.txt @@ -168,7 +168,7 @@ set( depLibs hurricane ${Boost_LIBRARIES} - ${Python_LIBRARIES} + ) add_python_module( "${pyCpps}" diff --git a/hurricane/src/viewer/CMakeLists.txt b/hurricane/src/viewer/CMakeLists.txt index 48fc1d33..7ab12e3e 100644 --- a/hurricane/src/viewer/CMakeLists.txt +++ b/hurricane/src/viewer/CMakeLists.txt @@ -150,7 +150,7 @@ ${UTILITIES_LIBRARY} ${LIBXML2_LIBRARIES} ${QtX_LIBRARIES} - ${Python_LIBRARIES} + ) add_library( viewer ${cpps} ${MOC_SRCS} ${RCC_SRCS} ${pyCpps} ) diff --git a/ispd/CMakeLists.txt b/ispd/CMakeLists.txt index db474da9..9793382e 100644 --- a/ispd/CMakeLists.txt +++ b/ispd/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(ISPD) - cmake_minimum_required(VERSION 2.4.0) + cmake_minimum_required(VERSION 3.18) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) diff --git a/ispd/src/CMakeLists.txt b/ispd/src/CMakeLists.txt index a6b7a6cd..e2497200 100644 --- a/ispd/src/CMakeLists.txt +++ b/ispd/src/CMakeLists.txt @@ -33,7 +33,7 @@ ${LEFDEF_LIBRARIES} ${QT_LIBRARIES} ${Boost_LIBRARIES} - ${Python_LIBRARIES} + -lutil ${LIBXML2_LIBRARIES} ) diff --git a/karakaze/CMakeLists.txt b/karakaze/CMakeLists.txt index eb61086a..d6bbff4c 100644 --- a/karakaze/CMakeLists.txt +++ b/karakaze/CMakeLists.txt @@ -2,7 +2,7 @@ project(KARAKAZE) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) set(ignoreVariables "${BUILD_DOC}" "${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) diff --git a/katana/CMakeLists.txt b/katana/CMakeLists.txt index ad288fce..f8660c58 100644 --- a/katana/CMakeLists.txt +++ b/katana/CMakeLists.txt @@ -7,7 +7,7 @@ option(CHECK_DATABASE "Run database in full check mode (very slow)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") diff --git a/katana/src/CMakeLists.txt b/katana/src/CMakeLists.txt index b5a07e16..79cd62c6 100644 --- a/katana/src/CMakeLists.txt +++ b/katana/src/CMakeLists.txt @@ -109,7 +109,7 @@ ${QtX_LIBRARIES} ${Boost_LIBRARIES} ${LIBXML2_LIBRARIES} - ${Python_LIBRARIES} -lutil + -lutil ${LIBEXECINFO_LIBRARIES} ) diff --git a/lefdef/CMakeLists.txt b/lefdef/CMakeLists.txt index 4f36865b..b2fed8bb 100644 --- a/lefdef/CMakeLists.txt +++ b/lefdef/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(LEFDEF) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) diff --git a/mauka/CMakeLists.txt b/mauka/CMakeLists.txt index e63de3fd..326e2bfe 100644 --- a/mauka/CMakeLists.txt +++ b/mauka/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(MAUKA) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") diff --git a/mauka/src/CMakeLists.txt b/mauka/src/CMakeLists.txt index 2b5c27d9..09ccf1a7 100644 --- a/mauka/src/CMakeLists.txt +++ b/mauka/src/CMakeLists.txt @@ -64,7 +64,7 @@ ${QtX_LIBRARIES} ${Boost_LIBRARIES} ${LIBXML2_LIBRARIES} - ${Python_LIBRARIES} -lutil + -lutil ) add_library ( pyMauka MODULE ${pyCpps} ) diff --git a/metis/CMakeLists.txt b/metis/CMakeLists.txt index 16238519..159d9436 100644 --- a/metis/CMakeLists.txt +++ b/metis/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(METIS) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") diff --git a/metis/src/CMakeLists.txt b/metis/src/CMakeLists.txt index 125c8bde..5b8d5ef3 100644 --- a/metis/src/CMakeLists.txt +++ b/metis/src/CMakeLists.txt @@ -44,7 +44,7 @@ endif ( HMETIS_FOUND ) ${QT_LIBRARIES} ${Boost_LIBRARIES} ${LIBXML2_LIBRARIES} - ${Python_LIBRARIES} -lutil + -lutil ) add_library ( pyMetis MODULE ${pyCpps} ) diff --git a/oroshi/CMakeLists.txt b/oroshi/CMakeLists.txt index b22da068..d74de7e8 100644 --- a/oroshi/CMakeLists.txt +++ b/oroshi/CMakeLists.txt @@ -2,7 +2,7 @@ project(OROSHI) - cmake_minimum_required(VERSION 2.8.0) + cmake_minimum_required(VERSION 3.18) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) set(ignoreVariables "${CMAKE_INSTALL_DIR}") diff --git a/pyproject.toml b/pyproject.toml index 198a1e2a..6f8c3435 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,7 @@ before-all = ''' boost-devel \ boost-python boost-filesystem \ boost-regex boost-wave \ - python3-devel libxml2-devel \ + python36-devel libxml2-devel \ qwt-devel ''' build-verbosity=2 diff --git a/solstice/CMakeLists.txt b/solstice/CMakeLists.txt index 99ae70f4..73a4b8aa 100644 --- a/solstice/CMakeLists.txt +++ b/solstice/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(SOLSTICE) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) diff --git a/solstice/src/CMakeLists.txt b/solstice/src/CMakeLists.txt index 35b6c7ca..2dbe9e7d 100644 --- a/solstice/src/CMakeLists.txt +++ b/solstice/src/CMakeLists.txt @@ -55,7 +55,7 @@ ${QtX_LIBRARIES} ${Boost_LIBRARIES} ${LIBXML2_LIBRARIES} - ${Python_LIBRARIES} -lutil + -lutil ) install ( TARGETS solstice DESTINATION lib${LIB_SUFFIX} ) diff --git a/stratus1/CMakeLists.txt b/stratus1/CMakeLists.txt index fdf8128c..6857cab7 100644 --- a/stratus1/CMakeLists.txt +++ b/stratus1/CMakeLists.txt @@ -8,7 +8,7 @@ set(ignoreVariables "${BUILD_DOC}" "${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 2.8.0) + cmake_minimum_required(VERSION 3.18) list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) setup_project_paths(CORIOLIS) diff --git a/tutorial/CMakeLists.txt b/tutorial/CMakeLists.txt index a4c7edd6..70633387 100644 --- a/tutorial/CMakeLists.txt +++ b/tutorial/CMakeLists.txt @@ -5,7 +5,7 @@ option(BUILD_DOC "Build the documentation (doxygen)" OFF) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) set(ignoreVariables "${LIB_SUFFIX} ${BUILD_DOC} ${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) diff --git a/tutorial/src/CMakeLists.txt b/tutorial/src/CMakeLists.txt index 8fdfae1e..2b04d79b 100644 --- a/tutorial/src/CMakeLists.txt +++ b/tutorial/src/CMakeLists.txt @@ -40,7 +40,7 @@ ${QtX_LIBRARIES} ${Boost_LIBRARIES} ${LIBXML2_LIBRARIES} - ${Python_LIBRARIES} -lutil + -lutil ${LIBEXECINFO_LIBRARIES} ) diff --git a/unicorn/CMakeLists.txt b/unicorn/CMakeLists.txt index f796749c..5ca53885 100644 --- a/unicorn/CMakeLists.txt +++ b/unicorn/CMakeLists.txt @@ -5,7 +5,7 @@ option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) set(ignoreVariables "${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) diff --git a/unicorn/src/CMakeLists.txt b/unicorn/src/CMakeLists.txt index 4562cf40..872a3307 100644 --- a/unicorn/src/CMakeLists.txt +++ b/unicorn/src/CMakeLists.txt @@ -77,7 +77,7 @@ ${OA_LIBRARIES} ${QtX_LIBRARIES} ${Boost_LIBRARIES} - ${Python_LIBRARIES} + -lutil ${LIBXML2_LIBRARIES} ${BZIP2_LIBRARIES} diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index 85b62a06..fdcc7c02 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -4,7 +4,7 @@ project(UNITTEST) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 2.8.9) + cmake_minimum_required(VERSION 3.18) set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) diff --git a/unittests/src/CMakeLists.txt b/unittests/src/CMakeLists.txt index c328cb92..82fc9d88 100644 --- a/unittests/src/CMakeLists.txt +++ b/unittests/src/CMakeLists.txt @@ -33,7 +33,7 @@ endif() ${OA_LIBRARIES} ${QtX_LIBRARIES} ${Boost_LIBRARIES} - ${Python_LIBRARIES} + -lutil ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES}