From 10bd5510dac308a5bd5f14fba9993666c524ca53 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Mon, 22 Nov 2021 00:05:48 +0100 Subject: [PATCH] Fix library linking problem for gcc 9 and above (Ubuntu 20/Debian 11). * Bug: In all CMakeLists.txt, it seems I was doing a worng use of target_link_library(). No longer add dependencies to the C++ base library but instead either to the Python associated module or to the final binaries. This was inderectly causing the linking problem related to Python (which was a misdirection). * Bug: Typo in FindLibexecinfo.cmake, do not use FindLib[E]xecinfo. * Change: In CRL/ccore/CMakeLists.txt, activate SKIP_AUTOMOC on bison/flex generated files. * Bug: In viewer/PyHApplication, do not delete the C++ object in the Python destroy method. --- anabatic/CMakeLists.txt | 1 + anabatic/src/CMakeLists.txt | 5 ++- bootstrap/cmake_modules/FindBootstrap.cmake | 23 ++++++----- bootstrap/cmake_modules/FindLibexecinfo.cmake | 14 +++---- bora/src/CMakeLists.txt | 4 +- crlcore/CMakeLists.txt | 1 + crlcore/src/LibraryManager/CMakeLists.txt | 33 +++++++-------- crlcore/src/ccore/CMakeLists.txt | 37 ++++++++++------- crlcore/src/cyclop/CMakeLists.txt | 6 ++- crlcore/src/pyCRL/CMakeLists.txt | 17 ++++++++ crlcore/src/x2y/CMakeLists.txt | 6 ++- equinox/src/CMakeLists.txt | 34 ++++++++-------- etesian/src/CMakeLists.txt | 2 +- hurricane/src/analog/CMakeLists.txt | 2 +- hurricane/src/configuration/CMakeLists.txt | 12 ++---- hurricane/src/viewer/CMakeLists.txt | 2 +- hurricane/src/viewer/PyHApplication.cpp | 2 +- katabatic/src/CMakeLists.txt | 4 +- katana/CMakeLists.txt | 1 + katana/src/CMakeLists.txt | 5 ++- kite/src/CMakeLists.txt | 4 +- knik/src/CMakeLists.txt | 34 ++++++++-------- lefdef/src/def/defzlib/CMakeLists.txt | 2 +- lefdef/src/lef/lefzlib/CMakeLists.txt | 2 +- mauka/src/CMakeLists.txt | 40 +++++++++---------- metis/src/CMakeLists.txt | 38 +++++++++--------- nimbus/src/CMakeLists.txt | 34 ++++++++-------- solstice/src/CMakeLists.txt | 32 +++++++-------- tutorial/src/CMakeLists.txt | 4 +- unicorn/CMakeLists.txt | 1 + unicorn/src/CMakeLists.txt | 7 ++-- unittests/CMakeLists.txt | 1 + unittests/src/CMakeLists.txt | 5 ++- vlsisapd/src/bookshelf/src/CMakeLists.txt | 2 +- vlsisapd/src/configuration/src/CMakeLists.txt | 26 ++++++------ vlsisapd/src/liberty/src/CMakeLists.txt | 6 +-- 36 files changed, 241 insertions(+), 208 deletions(-) diff --git a/anabatic/CMakeLists.txt b/anabatic/CMakeLists.txt index 1b59b28d..825c5bd7 100644 --- a/anabatic/CMakeLists.txt +++ b/anabatic/CMakeLists.txt @@ -25,6 +25,7 @@ find_package(HURRICANE REQUIRED) find_package(CORIOLIS REQUIRED) find_package(ETESIAN REQUIRED) + find_package(COLOQUINTE REQUIRED) find_package(Doxygen) add_subdirectory(src) diff --git a/anabatic/src/CMakeLists.txt b/anabatic/src/CMakeLists.txt index 9495599a..966b2db8 100644 --- a/anabatic/src/CMakeLists.txt +++ b/anabatic/src/CMakeLists.txt @@ -11,7 +11,7 @@ endif ( CHECK_DETERMINISM ) ${CONFIGURATION_INCLUDE_DIR} ${FLUTE_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} - ${QtX_INCLUDE_DIR} + ${QtX_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ) set( includes anabatic/Constants.h @@ -80,6 +80,7 @@ endif ( CHECK_DETERMINISM ) ${CONFIGURATION_LIBRARY} ${CIF_LIBRARY} ${AGDS_LIBRARY} + ${COLOQUINTE_LIBRARIES} ${FLUTE_LIBRARIES} ${LEFDEF_LIBRARIES} ${OA_LIBRARIES} @@ -91,7 +92,7 @@ endif ( CHECK_DETERMINISM ) add_library( anabatic ${cpps} ) set_target_properties( anabatic PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries( anabatic ${depLibs} ) +#target_link_libraries( anabatic ${depLibs} ) add_python_module( "${pyCpps}" "${pyIncludes}" diff --git a/bootstrap/cmake_modules/FindBootstrap.cmake b/bootstrap/cmake_modules/FindBootstrap.cmake index f6e2cc07..5000f621 100644 --- a/bootstrap/cmake_modules/FindBootstrap.cmake +++ b/bootstrap/cmake_modules/FindBootstrap.cmake @@ -220,16 +220,16 @@ find_package(Qt5Svg REQUIRED) find_package(Qt5PrintSupport REQUIRED) set(CMAKE_AUTOMOC ON) - set(QtX_INCLUDE_DIR ${Qt5PrintSupport_INCLUDE_DIRS} - ${Qt5Widgets_INCLUDE_DIRS} - ${Qt5Svg_INCLUDE_DIRS} - ${Qt5Gui_INCLUDE_DIRS} - ${Qt5Core_INCLUDE_DIRS} ) - set(QtX_LIBRARIES ${Qt5PrintSupport_LIBRARIES} - ${Qt5Widgets_LIBRARIES} - ${Qt5Gui_LIBRARIES} - ${Qt5Core_LIBRARIES} ) - #message(STATUS "QtX_INCLUDE_DIR: ${QtX_INCLUDE_DIR}") + set(QtX_INCLUDE_DIRS ${Qt5PrintSupport_INCLUDE_DIRS} + ${Qt5Widgets_INCLUDE_DIRS} + ${Qt5Svg_INCLUDE_DIRS} + ${Qt5Gui_INCLUDE_DIRS} + ${Qt5Core_INCLUDE_DIRS} ) + set(QtX_LIBRARIES ${Qt5PrintSupport_LIBRARIES} + ${Qt5Widgets_LIBRARIES} + ${Qt5Gui_LIBRARIES} + ${Qt5Core_LIBRARIES} ) + #message(STATUS "QtX_INCLUDE_DIRS: ${QtX_INCLUDE_DIRS}") #message(STATUS "QtX_LIBRARIES: ${QtX_LIBRARIES}") else() message(STATUS "Attempt to find Qt 4...") @@ -239,7 +239,8 @@ find_package(Qt4 REQUIRED) include(${QT_USE_FILE}) # ${QT_QTSVG_LIBRARY} - set(QtX_LIBRARIES ${QT_LIBRARIES}) + set(QtX_INCLUDE_DIRS ${QT_INCLUDE_DIR}) + set(QtX_LIBRARIES ${QT_LIBRARIES}) endif() endmacro() diff --git a/bootstrap/cmake_modules/FindLibexecinfo.cmake b/bootstrap/cmake_modules/FindLibexecinfo.cmake index ecdd4bfe..6b9c3de1 100644 --- a/bootstrap/cmake_modules/FindLibexecinfo.cmake +++ b/bootstrap/cmake_modules/FindLibexecinfo.cmake @@ -1,9 +1,9 @@ -# Try to find LibExecinfo functionality +# Try to find Libexecinfo functionality # Once done this will define # -# LIBEXECINFO_FOUND - system has LibExecinfo -# LIBEXECINFO_INCLUDE_DIR - LibExecinfo include directory -# LIBEXECINFO_LIBRARIES - Libraries needed to use LibExecinfo +# LIBEXECINFO_FOUND - system has Libexecinfo +# LIBEXECINFO_INCLUDE_DIR - Libexecinfo include directory +# LIBEXECINFO_LIBRARIES - Libraries needed to use Libexecinfo # # TODO: This will enable translations only if Gettext functionality is # present in libc. Must have more robust system for release, where Gettext @@ -17,7 +17,7 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. if(LIBEXECINFO_INCLUDE_DIR AND LIBEXECINFO_LIB_FOUND) - set(LibExecinfo_FIND_QUIETLY TRUE) + set(Libexecinfo_FIND_QUIETLY TRUE) endif(LIBEXECINFO_INCLUDE_DIR AND LIBEXECINFO_LIB_FOUND) find_path(LIBEXECINFO_INCLUDE_DIR execinfo.h) @@ -41,6 +41,6 @@ if(LIBEXECINFO_INCLUDE_DIR) endif(LIBEXECINFO_INCLUDE_DIR) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(LibExecinfo DEFAULT_MSG LIBEXECINFO_INCLUDE_DIR LIBEXECINFO_LIB_FOUND) +find_package_handle_standard_args(Libexecinfo DEFAULT_MSG LIBEXECINFO_INCLUDE_DIR LIBEXECINFO_LIB_FOUND) -mark_as_advanced(LIBEXECINFO_INCLUDE_DIR LIBEXECINFO_LIBRARIES LIBEXECINFO_LIBC_HAS_LIBEXECINFO_BACKTRACE LIBEXECINFO_LIB_FOUND) \ No newline at end of file +mark_as_advanced(LIBEXECINFO_INCLUDE_DIR LIBEXECINFO_LIBRARIES LIBEXECINFO_LIBC_HAS_LIBEXECINFO_BACKTRACE LIBEXECINFO_LIB_FOUND) diff --git a/bora/src/CMakeLists.txt b/bora/src/CMakeLists.txt index a8771c0a..901ef0bf 100644 --- a/bora/src/CMakeLists.txt +++ b/bora/src/CMakeLists.txt @@ -8,7 +8,7 @@ ${CONFIGURATION_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${QWT_INCLUDE_DIR} - ${QtX_INCLUDE_DIR} + ${QtX_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ) set( includes bora/Constants.h @@ -106,7 +106,7 @@ add_library( bora ${cpps} ${mocCpps} ${pyCpps} ) set_target_properties( bora PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries( bora ${depLibs} ) +#target_link_libraries( bora ${depLibs} ) add_python_module( "${pyCpps}" "${pyIncludes}" diff --git a/crlcore/CMakeLists.txt b/crlcore/CMakeLists.txt index a753658a..a293e96f 100644 --- a/crlcore/CMakeLists.txt +++ b/crlcore/CMakeLists.txt @@ -28,6 +28,7 @@ find_package(Libbfd) endif() find_package(LibXml2 REQUIRED) + find_package(BZip2 REQUIRED) find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(BISON REQUIRED) diff --git a/crlcore/src/LibraryManager/CMakeLists.txt b/crlcore/src/LibraryManager/CMakeLists.txt index 497e6ca3..64fabf2c 100644 --- a/crlcore/src/LibraryManager/CMakeLists.txt +++ b/crlcore/src/LibraryManager/CMakeLists.txt @@ -5,6 +5,7 @@ ${CRLCORE_SOURCE_DIR}/src/ccore/bookshelf ${CRLCORE_SOURCE_DIR}/src/ccore/alliance/ap ${CRLCORE_SOURCE_DIR}/src/ccore/alliance/vst + ${QtX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CONFIGURATION_INCLUDE_DIR} ${HURRICANE_INCLUDE_DIR} @@ -34,22 +35,22 @@ add_library( libmanager ${cpps} ${moccpps} ) set_target_properties( libmanager PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries( libmanager crlcore - ${HURRICANE_PYTHON_LIBRARIES} - ${HURRICANE_GRAPHICAL_LIBRARIES} - ${HURRICANE_LIBRARIES} - ${BOOKSHELF_LIBRARY} - ${CONFIGURATION_LIBRARY} - ${CIF_LIBRARY} - ${AGDS_LIBRARY} - ${UTILITIES_LIBRARY} - ${LEFDEF_LIBRARIES} - ${OA_LIBRARIES} - ${QtX_LIBRARIES} - ${Boost_LIBRARIES} - ${LIBXML2_LIBRARIES} - ${PYTHON_LIBRARIES} -lutil - ) +#target_link_libraries( libmanager crlcore +# ${HURRICANE_PYTHON_LIBRARIES} +# ${HURRICANE_GRAPHICAL_LIBRARIES} +# ${HURRICANE_LIBRARIES} +# ${BOOKSHELF_LIBRARY} +# ${CONFIGURATION_LIBRARY} +# ${CIF_LIBRARY} +# ${AGDS_LIBRARY} +# ${UTILITIES_LIBRARY} +# ${LEFDEF_LIBRARIES} +# ${OA_LIBRARIES} +# ${QtX_LIBRARIES} +# ${Boost_LIBRARIES} +# ${LIBXML2_LIBRARIES} +# ${PYTHON_LIBRARIES} -lutil +# ) install( TARGETS libmanager DESTINATION lib${LIB_SUFFIX} ) install( FILES ${includes} ${mocincludes} DESTINATION include/coriolis2/crlcore ) diff --git a/crlcore/src/ccore/CMakeLists.txt b/crlcore/src/ccore/CMakeLists.txt index c14d4c0e..122f1593 100644 --- a/crlcore/src/ccore/CMakeLists.txt +++ b/crlcore/src/ccore/CMakeLists.txt @@ -31,7 +31,7 @@ ${HURRICANE_INCLUDE_DIR} ${Python_INCLUDE_DIRS} ${Boost_INCLUDE_DIR} - ${QtX_INCLUDE_DIR} + ${QtX_INCLUDE_DIRS} ) add_definitions ( -DCORIOLIS_TOP="${CORIOLIS_TOP}" @@ -253,7 +253,7 @@ OUTPUT ${AcmSigdaParserScannerCpp} COMMAND ${FLEX_EXECUTABLE} ARGS -PAcmSigda_ -o${AcmSigdaParserScannerCpp} - ${AcmSigdaParserScanner} + ${AcmSigdaParserScanner} ) add_custom_command ( MAIN_DEPENDENCY ${AcmSigdaParserGrammar} DEPENDS ${AcmSigdaParserScannerCpp} @@ -261,7 +261,7 @@ OUTPUT ${AcmSigdaParserGrammarCpp} COMMAND ${BISON_EXECUTABLE} ARGS -d -v -p AcmSigda_ -y ${AcmSigdaParserGrammar} - -o ${AcmSigdaParserGrammarCpp} + -o ${AcmSigdaParserGrammarCpp} ) include_directories ( ${AcmSigdaParserBinaryDir} ) set ( acmsigda_parser_cpps ${AcmSigdaParserScannerCpp} @@ -272,6 +272,13 @@ qtX_wrap_cpp ( moc_cpps ${mocincludes} ) + set_property ( SOURCE ${VstParserGrammarCpp} + ${VstParserScannerCpp} + ${AcmSigdaParserGrammarCpp} + ${AcmSigdaParserScannerCpp} + ${IocParserGrammarCpp} + ${IocParserScannerCpp} + PROPERTY SKIP_AUTOMOC ON) add_library ( crlcore ${ccore_cpps} ${moc_cpps} @@ -296,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 ) diff --git a/crlcore/src/cyclop/CMakeLists.txt b/crlcore/src/cyclop/CMakeLists.txt index 585dab8a..15613590 100644 --- a/crlcore/src/cyclop/CMakeLists.txt +++ b/crlcore/src/cyclop/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories ( ${CRLCORE_SOURCE_DIR}/src/ccore ${HURRICANE_INCLUDE_DIR} ${UTILITIES_INCLUDE_DIR} - ${QtX_INCLUDE_DIR} + ${QtX_INCLUDE_DIRS} ${Boost_INCLUDE_DIR} ) @@ -22,9 +22,9 @@ add_executable ( cyclop ${cpps} ${moccpps} ) target_link_libraries ( cyclop crlcore + ${HURRICANE_GRAPHICAL_LIBRARIES} ${HURRICANE_PYTHON_NEW_LIBRARIES} ${HURRICANE_PYTHON_LIBRARIES} - ${HURRICANE_GRAPHICAL_LIBRARIES} ${HURRICANE_LIBRARIES} ${BOOKSHELF_LIBRARY} ${LEFDEF_LIBRARIES} @@ -34,8 +34,10 @@ ${Python_LIBRARIES} -lutil ${LIBXML2_LIBRARIES} + ${BZIP2_LIBRARIES} ${LIBEXECINFO_LIBRARIES} ${LIBBFD_LIBRARIES} + z ) install ( TARGETS cyclop DESTINATION bin ) diff --git a/crlcore/src/pyCRL/CMakeLists.txt b/crlcore/src/pyCRL/CMakeLists.txt index ca1585ee..ec6aad3a 100644 --- a/crlcore/src/pyCRL/CMakeLists.txt +++ b/crlcore/src/pyCRL/CMakeLists.txt @@ -19,6 +19,7 @@ ${CONFIGURATION_INCLUDE_DIR} ${Python_INCLUDE_DIRS} ${Boost_INCLUDE_DIR} + ${QtX_INCLUDE_DIRS} ) add_definitions( -DCORIOLIS_TOP="${CORIOLIS_TOP}" @@ -72,9 +73,25 @@ crlcore/PyLefImport.h crlcore/PyDefImport.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 +# ) + set( depLibs crlcore + ${HURRICANE_GRAPHICAL_LIBRARIES} + ${HURRICANE_PYTHON_NEW_LIBRARIES} ${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 a60799dd..674f4b7e 100644 --- a/crlcore/src/x2y/CMakeLists.txt +++ b/crlcore/src/x2y/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories ( ${CRLCORE_SOURCE_DIR}/src/ccore ${HURRICANE_INCLUDE_DIR} ${UTILITIES_INCLUDE_DIR} - ${Boost_INCLUDE_DIRS} + ${Boost_INCLUDE_DIR} ) set ( cpps x2y.cpp ) @@ -11,9 +11,9 @@ add_executable ( cx2y ${cpps} ) target_link_libraries ( cx2y crlcore + ${HURRICANE_GRAPHICAL_LIBRARIES} ${HURRICANE_PYTHON_NEW_LIBRARIES} ${HURRICANE_PYTHON_LIBRARIES} - ${HURRICANE_GRAPHICAL_LIBRARIES} ${HURRICANE_LIBRARIES} ${BOOKSHELF_LIBRARY} ${LEFDEF_LIBRARIES} @@ -23,7 +23,9 @@ ${Python_LIBRARIES} -lutil ${LIBXML2_LIBRARIES} + ${BZIP2_LIBRARIES} ${LIBEXECINFO_LIBRARIES} ${LIBBFD_LIBRARIES} + z ) install ( TARGETS cx2y DESTINATION bin ) diff --git a/equinox/src/CMakeLists.txt b/equinox/src/CMakeLists.txt index a054c8d3..a22a7792 100644 --- a/equinox/src/CMakeLists.txt +++ b/equinox/src/CMakeLists.txt @@ -6,7 +6,7 @@ ${HURRICANE_INCLUDE_DIR} ${CORIOLIS_INCLUDE_DIR} ${UTILITIES_INCLUDE_DIR} - ${QtX_INCLUDE_DIR} + ${QtX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) @@ -40,25 +40,25 @@ add_library ( intervalTree ${intervalTreeCpps} ) set_target_properties ( intervalTree PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries ( intervalTree ${HURRICANE_LIBRARIES} ) +#target_link_libraries ( intervalTree ${HURRICANE_LIBRARIES} ) add_library ( equinox ${cpps} ${mocCpps} ) set_target_properties ( equinox PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries ( equinox intervalTree - ${CORIOLIS_LIBRARIES} - ${HURRICANE_PYTHON_LIBRARIES} - ${HURRICANE_GRAPHICAL_LIBRARIES} - ${HURRICANE_LIBRARIES} - ${CONFIGURATION_LIBRARY} - ${CIF_LIBRARY} - ${AGDS_LIBRARY} - ${LEFDEF_LIBRARIES} - ${OA_LIBRARIES} - ${QtX_LIBRARIES} - ${Boost_LIBRARIES} - ${LIBXML2_LIBRARIES} - ${PYTHON_LIBRARIES} -lutil - ) +#target_link_libraries ( equinox intervalTree +# ${CORIOLIS_LIBRARIES} +# ${HURRICANE_PYTHON_LIBRARIES} +# ${HURRICANE_GRAPHICAL_LIBRARIES} +# ${HURRICANE_LIBRARIES} +# ${CONFIGURATION_LIBRARY} +# ${CIF_LIBRARY} +# ${AGDS_LIBRARY} +# ${LEFDEF_LIBRARIES} +# ${OA_LIBRARIES} +# ${QtX_LIBRARIES} +# ${Boost_LIBRARIES} +# ${LIBXML2_LIBRARIES} +# ${PYTHON_LIBRARIES} -lutil +# ) install ( TARGETS equinox intervalTree DESTINATION lib${LIB_SUFFIX} ) install ( FILES ${includes} diff --git a/etesian/src/CMakeLists.txt b/etesian/src/CMakeLists.txt index cde53f53..93693bc5 100644 --- a/etesian/src/CMakeLists.txt +++ b/etesian/src/CMakeLists.txt @@ -64,7 +64,7 @@ add_library( etesian ${cpps} ${mocCpps} ${pyCpps} ) set_target_properties( etesian PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries( etesian ${depLibs} ) +#target_link_libraries( etesian ${depLibs} ) add_python_module( "${pyCpps}" "${pyIncludes}" diff --git a/hurricane/src/analog/CMakeLists.txt b/hurricane/src/analog/CMakeLists.txt index acd1ed06..ef454c26 100644 --- a/hurricane/src/analog/CMakeLists.txt +++ b/hurricane/src/analog/CMakeLists.txt @@ -164,7 +164,7 @@ add_library( analog ${cpps} ${pyCpps} ) set_target_properties( analog PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries( analog ${depLibs} ) +#target_link_libraries( analog ${depLibs} ) add_python_module( "${pyCpps}" "${pyIncludes}" diff --git a/hurricane/src/configuration/CMakeLists.txt b/hurricane/src/configuration/CMakeLists.txt index 4d951162..09bd0170 100644 --- a/hurricane/src/configuration/CMakeLists.txt +++ b/hurricane/src/configuration/CMakeLists.txt @@ -1,5 +1,6 @@ message( "Python_INCLUDE_DIRS=${Python_INCLUDE_DIRS}" ) + message( "QtX_INCLUDE_DIRS=${QtX_INCLUDE_DIRS}" ) include_directories( ${HURRICANE_SOURCE_DIR}/src/utilities ${HURRICANE_SOURCE_DIR}/src/hurricane ${HURRICANE_SOURCE_DIR}/src/configuration @@ -83,28 +84,21 @@ add_library( configuration ${cpps} ${mocCpps} ${RCC_SRCS} ) set_target_properties( configuration PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries( configuration hurricane - ${QtX_LIBRARIES} - ${PYTHON_LIBRARIES} - ) add_library( pytypemanager ${pyTypeCpps} ) set_target_properties( pytypemanager PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries( pytypemanager hurricane - ${PYTHON_LIBRARIES} - ) add_python_module3( "${pyCfgCpps}" "${pyCfgIncludes}" Cfg - "pytypemanager;configuration" + "pytypemanager;configuration;hurricane;${QtX_LIBRARIES};${PYTHON_LIBRARIES}" include/coriolis2/hurricane/configuration ) add_python_module3( "${pyHurricane3Cpps}" "${pyHurricane3Includes}" Hurricane3 - "pytypemanager;configuration" + "pytypemanager;configuration;hurricane;${PYTHON_LIBRARIES}" include/coriolis2/hurricane/configuration ) diff --git a/hurricane/src/viewer/CMakeLists.txt b/hurricane/src/viewer/CMakeLists.txt index 9fc3030c..23fd50c8 100644 --- a/hurricane/src/viewer/CMakeLists.txt +++ b/hurricane/src/viewer/CMakeLists.txt @@ -146,7 +146,7 @@ add_library( viewer ${cpps} ${MOC_SRCS} ${RCC_SRCS} ${pyCpps} ) set_target_properties( viewer PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries( viewer ${depLibs} ) +#target_link_libraries( viewer ${depLibs} ) add_python_module( "${pyCpps}" "${pyIncludes}" diff --git a/hurricane/src/viewer/PyHApplication.cpp b/hurricane/src/viewer/PyHApplication.cpp index e537881b..6e53ee0e 100644 --- a/hurricane/src/viewer/PyHApplication.cpp +++ b/hurricane/src/viewer/PyHApplication.cpp @@ -142,7 +142,7 @@ extern "C" { }; - DirectDeleteMethod(PyHApplication_DeAlloc,PyHApplication) + PythonOnlyDeleteMethod(HApplication) PyTypeObjectLinkPyType(HApplication) diff --git a/katabatic/src/CMakeLists.txt b/katabatic/src/CMakeLists.txt index 0e296c92..47a35346 100644 --- a/katabatic/src/CMakeLists.txt +++ b/katabatic/src/CMakeLists.txt @@ -11,7 +11,7 @@ endif ( CHECK_DETERMINISM ) ${KNIK_INCLUDE_DIR} ${CONFIGURATION_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} - ${QtX_INCLUDE_DIR} + ${QtX_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ) set( includes katabatic/Constants.h @@ -78,7 +78,7 @@ endif ( CHECK_DETERMINISM ) add_library( katabatic ${cpps} ) set_target_properties( katabatic PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries( katabatic ${depLibs} ) +#target_link_libraries( katabatic ${depLibs} ) add_python_module( "${pyCpps}" "${pyIncludes}" diff --git a/katana/CMakeLists.txt b/katana/CMakeLists.txt index 72aaa9b1..e1d0f0df 100644 --- a/katana/CMakeLists.txt +++ b/katana/CMakeLists.txt @@ -29,6 +29,7 @@ find_package(CORIOLIS REQUIRED) find_package(ANABATIC REQUIRED) find_package(ETESIAN REQUIRED) + find_package(COLOQUINTE REQUIRED) find_package(Doxygen) if(CHECK_DATABASE) diff --git a/katana/src/CMakeLists.txt b/katana/src/CMakeLists.txt index 7694045b..a06284a0 100644 --- a/katana/src/CMakeLists.txt +++ b/katana/src/CMakeLists.txt @@ -8,7 +8,7 @@ ${HURRICANE_INCLUDE_DIR} ${CONFIGURATION_INCLUDE_DIR} ${FLUTE_INCLUDE_DIR} - ${WtX_INCLUDE_DIR} + ${QtX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ) @@ -101,6 +101,7 @@ ${BOOKSHELF_LIBRARY} ${CIF_LIBRARY} ${AGDS_LIBRARY} + ${COLOQUINTE_LIBRARIES} ${UTILITIES_LIBRARY} ${FLUTE_LIBRARIES} ${LEFDEF_LIBRARIES} @@ -114,7 +115,7 @@ add_library( katana ${cpps} ${mocCpps} ${pyCpps} ) set_target_properties( katana PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries( katana ${depLibs} ) +#target_link_libraries( katana ${depLibs} ) add_python_module( "${pyCpps}" "${pyIncludes}" diff --git a/kite/src/CMakeLists.txt b/kite/src/CMakeLists.txt index 12bc3bbd..3d88d5a2 100644 --- a/kite/src/CMakeLists.txt +++ b/kite/src/CMakeLists.txt @@ -8,7 +8,7 @@ ${HURRICANE_INCLUDE_DIR} ${CONFIGURATION_INCLUDE_DIR} ${FLUTE_INCLUDE_DIR} - ${WtX_INCLUDE_DIR} + ${QtX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ) @@ -100,7 +100,7 @@ add_library( kite ${cpps} ${mocCpps} ${pyCpps} ) set_target_properties( kite PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries( kite ${depLibs} ) +#target_link_libraries( kite ${depLibs} ) add_python_module( "${pyCpps}" "${pyIncludes}" diff --git a/knik/src/CMakeLists.txt b/knik/src/CMakeLists.txt index e88876d4..aab3eab6 100644 --- a/knik/src/CMakeLists.txt +++ b/knik/src/CMakeLists.txt @@ -45,23 +45,23 @@ add_library ( knik ${cpps} ${mocCpps} ) set_target_properties ( knik PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries ( knik ${FLUTE_LIBRARY} - ${CORIOLIS_LIBRARIES} - ${HURRICANE_PYTHON_LIBRARIES} - ${HURRICANE_GRAPHICAL_LIBRARIES} - ${HURRICANE_LIBRARIES} - ${CONFIGURATION_LIBRARY} - ${CIF_LIBRARY} - ${AGDS_LIBRARY} - ${UTILITIES_LIBRARY} - ${FLUTE_LIBRARIES} - ${LEFDEF_LIBRARIES} - ${OA_LIBRARIES} - ${QtX_LIBRARIES} - ${Boost_LIBRARIES} - ${LIBXML2_LIBRARIES} - ${PYTHON_LIBRARIES} -lutil - ) +#target_link_libraries ( knik ${FLUTE_LIBRARY} +# ${CORIOLIS_LIBRARIES} +# ${HURRICANE_PYTHON_LIBRARIES} +# ${HURRICANE_GRAPHICAL_LIBRARIES} +# ${HURRICANE_LIBRARIES} +# ${CONFIGURATION_LIBRARY} +# ${CIF_LIBRARY} +# ${AGDS_LIBRARY} +# ${UTILITIES_LIBRARY} +# ${FLUTE_LIBRARIES} +# ${LEFDEF_LIBRARIES} +# ${OA_LIBRARIES} +# ${QtX_LIBRARIES} +# ${Boost_LIBRARIES} +# ${LIBXML2_LIBRARIES} +# ${PYTHON_LIBRARIES} -lutil +# ) install ( TARGETS knik DESTINATION lib${LIB_SUFFIX} ) install ( FILES ${includes} diff --git a/lefdef/src/def/defzlib/CMakeLists.txt b/lefdef/src/def/defzlib/CMakeLists.txt index e1f96319..bf160445 100644 --- a/lefdef/src/def/defzlib/CMakeLists.txt +++ b/lefdef/src/def/defzlib/CMakeLists.txt @@ -11,7 +11,7 @@ ) add_library ( defzlib ${cpps} ) - target_link_libraries ( defzlib def z ) +# target_link_libraries ( defzlib def z ) set_target_properties ( defzlib PROPERTIES VERSION 5.8 SOVERSION 5 ) install ( TARGETS defzlib DESTINATION lib${LIB_SUFFIX} ) diff --git a/lefdef/src/lef/lefzlib/CMakeLists.txt b/lefdef/src/lef/lefzlib/CMakeLists.txt index 9fda26fa..99b8e34d 100644 --- a/lefdef/src/lef/lefzlib/CMakeLists.txt +++ b/lefdef/src/lef/lefzlib/CMakeLists.txt @@ -11,7 +11,7 @@ ) add_library ( lefzlib ${cpps} ) - target_link_libraries ( lefzlib lef z ) +# target_link_libraries ( lefzlib lef z ) set_target_properties ( lefzlib PROPERTIES VERSION 5.8 SOVERSION 5 ) install ( TARGETS lefzlib DESTINATION lib${LIB_SUFFIX} ) diff --git a/mauka/src/CMakeLists.txt b/mauka/src/CMakeLists.txt index e8a2c9e0..49965802 100644 --- a/mauka/src/CMakeLists.txt +++ b/mauka/src/CMakeLists.txt @@ -22,7 +22,7 @@ mauka/Surface.h mauka/MaukaEngine.h ) - set ( mocIncludes mauka/GraphicMaukaEngine.h ) + set ( mocIncludes mauka/GraphicMaukaEngine.h ) set ( pyIncludes mauka/PyMaukaEngine.h mauka/PyGraphicMaukaEngine.h ) @@ -50,31 +50,31 @@ add_library ( mauka ${cpps} ${mocCpps} ${pyCpps} ) set_target_properties ( mauka PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries ( mauka ${METIS_LIBRARIES} - ${NIMBUS_LIBRARIES} - ${CORIOLIS_LIBRARIES} - ${HURRICANE_PYTHON_LIBRARIES} - ${HURRICANE_GRAPHICAL_LIBRARIES} - ${HURRICANE_LIBRARIES} - ${CONFIGURATION_LIBRARY} - ${CIF_LIBRARY} - ${AGDS_LIBRARY} - ${LEFDEF_LIBRARIES} - ${OA_LIBRARIES} - ${QtX_LIBRARIES} - ${Boost_LIBRARIES} - ${LIBXML2_LIBRARIES} - ${PYTHON_LIBRARIES} -lutil - ) +#target_link_libraries ( mauka ${METIS_LIBRARIES} +# ${NIMBUS_LIBRARIES} +# ${CORIOLIS_LIBRARIES} +# ${HURRICANE_PYTHON_LIBRARIES} +# ${HURRICANE_GRAPHICAL_LIBRARIES} +# ${HURRICANE_LIBRARIES} +# ${CONFIGURATION_LIBRARY} +# ${CIF_LIBRARY} +# ${AGDS_LIBRARY} +# ${LEFDEF_LIBRARIES} +# ${OA_LIBRARIES} +# ${QtX_LIBRARIES} +# ${Boost_LIBRARIES} +# ${LIBXML2_LIBRARIES} +# ${PYTHON_LIBRARIES} -lutil +# ) add_library ( pyMauka MODULE ${pyCpps} ) set_target_properties ( pyMauka PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1" PREFIX "" OUTPUT_NAME "Mauka" ) - target_link_libraries ( pyMauka mauka - ${CORIOLIS_PYTHON_LIBRARIES} - ) +#target_link_libraries ( pyMauka mauka +# ${CORIOLIS_PYTHON_LIBRARIES} +# ) install ( TARGETS mauka DESTINATION lib${LIB_SUFFIX} ) install ( TARGETS pyMauka DESTINATION ${PYTHON_SITE_PACKAGES} ) diff --git a/metis/src/CMakeLists.txt b/metis/src/CMakeLists.txt index d3ba4e9b..a92022b0 100644 --- a/metis/src/CMakeLists.txt +++ b/metis/src/CMakeLists.txt @@ -30,31 +30,31 @@ endif ( HMETIS_FOUND ) add_library ( metis ${cpps} ${pyCpps} ) set_target_properties ( metis PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries ( metis ${HMETIS_LIBRARIES} - ${NIMBUS_LIBRARIES} - ${CORIOLIS_LIBRARIES} - ${HURRICANE_PYTHON_LIBRARIES} - ${HURRICANE_GRAPHICAL_LIBRARIES} - ${HURRICANE_LIBRARIES} - ${CONFIGURATION_LIBRARY} - ${CIF_LIBRARY} - ${AGDS_LIBRARY} - ${LEFDEF_LIBRARIES} - ${OA_LIBRARIES} - ${QT_LIBRARIES} - ${Boost_LIBRARIES} - ${LIBXML2_LIBRARIES} - ${PYTHON_LIBRARIES} -lutil - ) +#target_link_libraries ( metis ${HMETIS_LIBRARIES} +# ${NIMBUS_LIBRARIES} +# ${CORIOLIS_LIBRARIES} +# ${HURRICANE_PYTHON_LIBRARIES} +# ${HURRICANE_GRAPHICAL_LIBRARIES} +# ${HURRICANE_LIBRARIES} +# ${CONFIGURATION_LIBRARY} +# ${CIF_LIBRARY} +# ${AGDS_LIBRARY} +# ${LEFDEF_LIBRARIES} +# ${OA_LIBRARIES} +# ${QT_LIBRARIES} +# ${Boost_LIBRARIES} +# ${LIBXML2_LIBRARIES} +# ${PYTHON_LIBRARIES} -lutil +# ) add_library ( pyMetis MODULE ${pyCpps} ) set_target_properties ( pyMetis PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1" PREFIX "" OUTPUT_NAME "Metis" ) - target_link_libraries ( pyMetis metis - ${CORIOLIS_PYTHON_LIBRARIES} - ) +#target_link_libraries ( pyMetis metis +# ${CORIOLIS_PYTHON_LIBRARIES} +# ) install ( TARGETS metis DESTINATION lib${LIB_SUFFIX} ) install ( TARGETS pyMetis DESTINATION ${PYTHON_SITE_PACKAGES} ) diff --git a/nimbus/src/CMakeLists.txt b/nimbus/src/CMakeLists.txt index e217f21c..332ef769 100644 --- a/nimbus/src/CMakeLists.txt +++ b/nimbus/src/CMakeLists.txt @@ -45,29 +45,29 @@ add_library ( nimbus ${cpps} ${pyCpps} ) set_target_properties ( nimbus PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries ( nimbus ${CORIOLIS_LIBRARIES} - ${HURRICANE_PYTHON_LIBRARIES} - ${HURRICANE_GRAPHICAL_LIBRARIES} - ${HURRICANE_LIBRARIES} - ${CONFIGURATION_LIBRARY} - ${CIF_LIBRARY} - ${AGDS_LIBRARY} - ${LEFDEF_LIBRARIES} - ${OA_LIBRARIES} - ${QtX_LIBRARIES} - ${Boost_LIBRARIES} - ${LIBXML2_LIBRARIES} - ${PYTHON_LIBRARIES} -lutil - ) +#target_link_libraries ( nimbus ${CORIOLIS_LIBRARIES} +# ${HURRICANE_PYTHON_LIBRARIES} +# ${HURRICANE_GRAPHICAL_LIBRARIES} +# ${HURRICANE_LIBRARIES} +# ${CONFIGURATION_LIBRARY} +# ${CIF_LIBRARY} +# ${AGDS_LIBRARY} +# ${LEFDEF_LIBRARIES} +# ${OA_LIBRARIES} +# ${QtX_LIBRARIES} +# ${Boost_LIBRARIES} +# ${LIBXML2_LIBRARIES} +# ${PYTHON_LIBRARIES} -lutil +# ) add_library ( pyNimbus MODULE ${pyCpps} ) set_target_properties ( pyNimbus PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1" PREFIX "" OUTPUT_NAME "Nimbus" ) - target_link_libraries ( pyNimbus nimbus - ${CORIOLIS_PYTHON_LIBRARIES} - ) +#target_link_libraries ( pyNimbus nimbus +# ${CORIOLIS_PYTHON_LIBRARIES} +# ) install ( TARGETS nimbus DESTINATION lib${LIB_SUFFIX} ) install ( TARGETS pyNimbus DESTINATION ${PYTHON_SITE_PACKAGES} ) diff --git a/solstice/src/CMakeLists.txt b/solstice/src/CMakeLists.txt index ab8d8805..0c939f92 100644 --- a/solstice/src/CMakeLists.txt +++ b/solstice/src/CMakeLists.txt @@ -6,7 +6,7 @@ ${EQUINOX_INCLUDE_DIR} ${CORIOLIS_INCLUDE_DIR} ${UTILITIES_INCLUDE_DIR} - ${QtX_INCLUDE_DIR} + ${QtX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) @@ -42,21 +42,21 @@ add_library ( solstice ${cpps} ${mocCpps} ) set_target_properties ( solstice PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries ( solstice ${EQUINOX_LIBRARIES} - ${CORIOLIS_LIBRARIES} - ${HURRICANE_PYTHON_LIBRARIES} - ${HURRICANE_GRAPHICAL_LIBRARIES} - ${HURRICANE_LIBRARIES} - ${CONFIGURATION_LIBRARY} - ${CIF_LIBRARY} - ${AGDS_LIBRARY} - ${LEFDEF_LIBRARIES} - ${OA_LIBRARIES} - ${QtX_LIBRARIES} - ${Boost_LIBRARIES} - ${LIBXML2_LIBRARIES} - ${PYTHON_LIBRARIES} -lutil - ) +#target_link_libraries ( solstice ${EQUINOX_LIBRARIES} +# ${CORIOLIS_LIBRARIES} +# ${HURRICANE_PYTHON_LIBRARIES} +# ${HURRICANE_GRAPHICAL_LIBRARIES} +# ${HURRICANE_LIBRARIES} +# ${CONFIGURATION_LIBRARY} +# ${CIF_LIBRARY} +# ${AGDS_LIBRARY} +# ${LEFDEF_LIBRARIES} +# ${OA_LIBRARIES} +# ${QtX_LIBRARIES} +# ${Boost_LIBRARIES} +# ${LIBXML2_LIBRARIES} +# ${PYTHON_LIBRARIES} -lutil +# ) install ( TARGETS solstice DESTINATION lib${LIB_SUFFIX} ) install ( FILES ${includes} diff --git a/tutorial/src/CMakeLists.txt b/tutorial/src/CMakeLists.txt index 3038a61e..5bb74cbd 100644 --- a/tutorial/src/CMakeLists.txt +++ b/tutorial/src/CMakeLists.txt @@ -5,7 +5,7 @@ ${CORIOLIS_INCLUDE_DIR} ${HURRICANE_INCLUDE_DIR} ${CONFIGURATION_INCLUDE_DIR} - ${QtX_INCLUDE_DIR} + ${QtX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ) @@ -46,7 +46,7 @@ add_library( tutorial ${cpps} ${mocCpps} ${pyCpps} ) set_target_properties( tutorial PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries( tutorial ${depLibs} ) +#target_link_libraries( tutorial ${depLibs} ) add_python_module( "${pyCpps}" "${pyIncludes}" diff --git a/unicorn/CMakeLists.txt b/unicorn/CMakeLists.txt index 8d9abe0c..b24f7227 100644 --- a/unicorn/CMakeLists.txt +++ b/unicorn/CMakeLists.txt @@ -24,6 +24,7 @@ find_package(Libbfd) endif() find_package(LibXml2 REQUIRED) + find_package(BZip2 REQUIRED) find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(LEFDEF REQUIRED) diff --git a/unicorn/src/CMakeLists.txt b/unicorn/src/CMakeLists.txt index b11095dd..6a7b563c 100644 --- a/unicorn/src/CMakeLists.txt +++ b/unicorn/src/CMakeLists.txt @@ -14,7 +14,7 @@ ${CORIOLIS_INCLUDE_DIR} ${BOOKSHELF_INCLUDE_DIR} ${CONFIGURATION_INCLUDE_DIR} - ${QtX_INCLUDE_DIR} + ${QtX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${LEFDEF_INCLUDE_DIR} ${Python_INCLUDE_DIRS} @@ -30,7 +30,7 @@ ) set( pyIncludes unicorn/PyUnicornGui.h ) - set( cpps ImportCell.cpp + set( cpps ImportCell.cpp OpenCellDialog.cpp SaveCellDialog.cpp ImportCellDialog.cpp @@ -80,12 +80,13 @@ ${Python_LIBRARIES} -lutil ${LIBXML2_LIBRARIES} + ${BZIP2_LIBRARIES} ${LIBBFD_LIBRARIES} ) add_library( unicorn ${cpps} ${mocCpps} ${pyCpps} ) set_target_properties( unicorn PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries( unicorn ${depLibs} ) +#target_link_libraries( unicorn ${depLibs} ) add_python_module( "${pyCpps}" "${pyIncludes}" diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index b15768d7..4c1d7f7b 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -26,6 +26,7 @@ find_package(Libbfd) endif() find_package(Libexecinfo REQUIRED) + find_package(BZip2 REQUIRED) find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(LEFDEF) diff --git a/unittests/src/CMakeLists.txt b/unittests/src/CMakeLists.txt index a1bf16c6..c328cb92 100644 --- a/unittests/src/CMakeLists.txt +++ b/unittests/src/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories ( ${CORIOLIS_INCLUDE_DIR} ${HURRICANE_INCLUDE_DIR} ${UTILITIES_INCLUDE_DIR} - ${QtX_INCLUDE_DIR} + ${QtX_INCLUDE_DIRS} ${Boost_INCLUDE_DIR} ) @@ -21,8 +21,8 @@ endif() add_executable ( unittests ${cpps} ) target_link_libraries ( unittests ${CORIOLIS_PYTHON_LIBRARIES} ${CORIOLIS_LIBRARIES} - ${HURRICANE_PYTHON_LIBRARIES} ${HURRICANE_GRAPHICAL_LIBRARIES} + ${HURRICANE_PYTHON_LIBRARIES} ${HURRICANE_LIBRARIES} ${BOOKSHELF_LIBRARY} ${AGDS_LIBRARY} @@ -35,6 +35,7 @@ endif() ${Boost_LIBRARIES} ${Python_LIBRARIES} -lutil + ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBEXECINFO_LIBRARIES} ${LIBBFD_LIBRARIES} diff --git a/vlsisapd/src/bookshelf/src/CMakeLists.txt b/vlsisapd/src/bookshelf/src/CMakeLists.txt index cd42acb4..a4d02827 100644 --- a/vlsisapd/src/bookshelf/src/CMakeLists.txt +++ b/vlsisapd/src/bookshelf/src/CMakeLists.txt @@ -24,7 +24,7 @@ ) set ( testcpps BookshelfTkMain.cpp ) add_library ( bookshelf ${cpps} ) - target_link_libraries ( bookshelf vlsisapdutils ) +#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}) diff --git a/vlsisapd/src/configuration/src/CMakeLists.txt b/vlsisapd/src/configuration/src/CMakeLists.txt index d900e5a0..7ef8a581 100644 --- a/vlsisapd/src/configuration/src/CMakeLists.txt +++ b/vlsisapd/src/configuration/src/CMakeLists.txt @@ -17,12 +17,12 @@ vlsisapd/configuration/ConfigurationWidget.h vlsisapd/configuration/ConfEditorWidget.h ) - set ( includes vlsisapd/configuration/Parameter.h + set ( includes vlsisapd/configuration/Parameter.h vlsisapd/configuration/LayoutDescription.h vlsisapd/configuration/Configuration.h vlsisapd/configuration/BoostPythonStlWrappers.h ) - set ( cpps Parameter.cpp + set ( cpps Parameter.cpp LayoutDescription.cpp Configuration.cpp FilePathEdit.cpp @@ -41,12 +41,12 @@ add_library ( configuration ${cpps} ${mocCpps} ${RCC_SRCS} ) set_target_properties ( configuration PROPERTIES VERSION 1.0 SOVERSION 1 ) - target_link_libraries ( configuration vlsisapdutils - ${QtX_LIBRARIES} - ${PYTHON_LIBRARIES} - ${LIBXML2_LIBRARIES} - ${Boost_LIBRARIES} - ) +#target_link_libraries ( configuration vlsisapdutils +# ${QtX_LIBRARIES} +# ${PYTHON_LIBRARIES} +# ${LIBXML2_LIBRARIES} +# ${Boost_LIBRARIES} +# ) if (Boost_FOUND) add_library ( pyConfiguration MODULE ${pycpps}) @@ -54,11 +54,11 @@ OUTPUT_NAME "Cfg" PREFIX "" ) - target_link_libraries ( pyConfiguration configuration - ${PYTHON_LIBRARIES} - ${LIBXML2_LIBRARIES} - ${Boost_LIBRARIES} - ) +#target_link_libraries ( pyConfiguration configuration +# ${PYTHON_LIBRARIES} +# ${LIBXML2_LIBRARIES} +# ${Boost_LIBRARIES} +# ) install ( TARGETS pyConfiguration DESTINATION ${PYTHON_SITE_PACKAGES} ) endif(Boost_FOUND) diff --git a/vlsisapd/src/liberty/src/CMakeLists.txt b/vlsisapd/src/liberty/src/CMakeLists.txt index bd457523..4829fcd3 100644 --- a/vlsisapd/src/liberty/src/CMakeLists.txt +++ b/vlsisapd/src/liberty/src/CMakeLists.txt @@ -54,8 +54,8 @@ add_library ( liberty ${cpps} ${liberty_parser_cpps} ) set_target_properties ( liberty PROPERTIES VERSION 1.0 SOVERSION 1) -target_link_libraries ( liberty ${Boost_LIBRARIES} - ) +#target_link_libraries ( liberty ${Boost_LIBRARIES} +# ) install ( TARGETS liberty DESTINATION lib${LIB_SUFFIX} ) install ( FILES ${includes} DESTINATION include/vlsisapd/liberty ) @@ -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 )