riscv
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Jean-Paul Chaput 2021-11-22 00:05:48 +01:00
parent 302accfbb1
commit 10bd5510da
36 changed files with 241 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
anabatic/CMakeLists.txt
View File

@ -25,6 +25,7 @@
find_package(HURRICANE REQUIRED) find_package(HURRICANE REQUIRED)
find_package(CORIOLIS REQUIRED) find_package(CORIOLIS REQUIRED)
find_package(ETESIAN REQUIRED) find_package(ETESIAN REQUIRED)
find_package(COLOQUINTE REQUIRED)
find_package(Doxygen) find_package(Doxygen)
add_subdirectory(src) add_subdirectory(src)

5
anabatic/src/CMakeLists.txt
View File

@ -11,7 +11,7 @@ endif ( CHECK_DETERMINISM )
${CONFIGURATION_INCLUDE_DIR} ${CONFIGURATION_INCLUDE_DIR}
${FLUTE_INCLUDE_DIR} ${FLUTE_INCLUDE_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${QtX_INCLUDE_DIR} ${QtX_INCLUDE_DIRS}
${Python_INCLUDE_DIRS} ${Python_INCLUDE_DIRS}
) )
set( includes anabatic/Constants.h set( includes anabatic/Constants.h
@ -80,6 +80,7 @@ endif ( CHECK_DETERMINISM )
${CONFIGURATION_LIBRARY} ${CONFIGURATION_LIBRARY}
${CIF_LIBRARY} ${CIF_LIBRARY}
${AGDS_LIBRARY} ${AGDS_LIBRARY}
${COLOQUINTE_LIBRARIES}
${FLUTE_LIBRARIES} ${FLUTE_LIBRARIES}
${LEFDEF_LIBRARIES} ${LEFDEF_LIBRARIES}
${OA_LIBRARIES} ${OA_LIBRARIES}
@ -91,7 +92,7 @@ endif ( CHECK_DETERMINISM )
add_library( anabatic ${cpps} ) add_library( anabatic ${cpps} )
set_target_properties( anabatic PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties( anabatic PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries( anabatic ${depLibs} ) #target_link_libraries( anabatic ${depLibs} )
add_python_module( "${pyCpps}" add_python_module( "${pyCpps}"
"${pyIncludes}" "${pyIncludes}"

5
bootstrap/cmake_modules/FindBootstrap.cmake
View File

@ -220,7 +220,7 @@
find_package(Qt5Svg REQUIRED) find_package(Qt5Svg REQUIRED)
find_package(Qt5PrintSupport REQUIRED) find_package(Qt5PrintSupport REQUIRED)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
set(QtX_INCLUDE_DIR ${Qt5PrintSupport_INCLUDE_DIRS} set(QtX_INCLUDE_DIRS ${Qt5PrintSupport_INCLUDE_DIRS}
${Qt5Widgets_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}
${Qt5Svg_INCLUDE_DIRS} ${Qt5Svg_INCLUDE_DIRS}
${Qt5Gui_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS}
@ -229,7 +229,7 @@
${Qt5Widgets_LIBRARIES} ${Qt5Widgets_LIBRARIES}
${Qt5Gui_LIBRARIES} ${Qt5Gui_LIBRARIES}
${Qt5Core_LIBRARIES} ) ${Qt5Core_LIBRARIES} )
#message(STATUS "QtX_INCLUDE_DIR: ${QtX_INCLUDE_DIR}") #message(STATUS "QtX_INCLUDE_DIRS: ${QtX_INCLUDE_DIRS}")
#message(STATUS "QtX_LIBRARIES: ${QtX_LIBRARIES}") #message(STATUS "QtX_LIBRARIES: ${QtX_LIBRARIES}")
else() else()
message(STATUS "Attempt to find Qt 4...") message(STATUS "Attempt to find Qt 4...")
@ -239,6 +239,7 @@
find_package(Qt4 REQUIRED) find_package(Qt4 REQUIRED)
include(${QT_USE_FILE}) include(${QT_USE_FILE})
# ${QT_QTSVG_LIBRARY} # ${QT_QTSVG_LIBRARY}
set(QtX_INCLUDE_DIRS ${QT_INCLUDE_DIR})
set(QtX_LIBRARIES ${QT_LIBRARIES}) set(QtX_LIBRARIES ${QT_LIBRARIES})
endif() endif()
endmacro() endmacro()

12
bootstrap/cmake_modules/FindLibexecinfo.cmake
View File

@ -1,9 +1,9 @@
# Try to find LibExecinfo functionality # Try to find Libexecinfo functionality
# Once done this will define # Once done this will define
# #
# LIBEXECINFO_FOUND - system has LibExecinfo # LIBEXECINFO_FOUND - system has Libexecinfo
# LIBEXECINFO_INCLUDE_DIR - LibExecinfo include directory # LIBEXECINFO_INCLUDE_DIR - Libexecinfo include directory
# LIBEXECINFO_LIBRARIES - Libraries needed to use LibExecinfo # LIBEXECINFO_LIBRARIES - Libraries needed to use Libexecinfo
# #
# TODO: This will enable translations only if Gettext functionality is # TODO: This will enable translations only if Gettext functionality is
# present in libc. Must have more robust system for release, where Gettext # 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. # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
if(LIBEXECINFO_INCLUDE_DIR AND LIBEXECINFO_LIB_FOUND) 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) endif(LIBEXECINFO_INCLUDE_DIR AND LIBEXECINFO_LIB_FOUND)
find_path(LIBEXECINFO_INCLUDE_DIR execinfo.h) find_path(LIBEXECINFO_INCLUDE_DIR execinfo.h)
@ -41,6 +41,6 @@ if(LIBEXECINFO_INCLUDE_DIR)
endif(LIBEXECINFO_INCLUDE_DIR) endif(LIBEXECINFO_INCLUDE_DIR)
include(FindPackageHandleStandardArgs) 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) mark_as_advanced(LIBEXECINFO_INCLUDE_DIR LIBEXECINFO_LIBRARIES LIBEXECINFO_LIBC_HAS_LIBEXECINFO_BACKTRACE LIBEXECINFO_LIB_FOUND)

4
bora/src/CMakeLists.txt
View File

@ -8,7 +8,7 @@
${CONFIGURATION_INCLUDE_DIR} ${CONFIGURATION_INCLUDE_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${QWT_INCLUDE_DIR} ${QWT_INCLUDE_DIR}
${QtX_INCLUDE_DIR} ${QtX_INCLUDE_DIRS}
${Python_INCLUDE_DIRS} ${Python_INCLUDE_DIRS}
) )
set( includes bora/Constants.h set( includes bora/Constants.h
@ -106,7 +106,7 @@
add_library( bora ${cpps} ${mocCpps} ${pyCpps} ) add_library( bora ${cpps} ${mocCpps} ${pyCpps} )
set_target_properties( bora PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties( bora PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries( bora ${depLibs} ) #target_link_libraries( bora ${depLibs} )
add_python_module( "${pyCpps}" add_python_module( "${pyCpps}"
"${pyIncludes}" "${pyIncludes}"

1
crlcore/CMakeLists.txt
View File

@ -28,6 +28,7 @@
find_package(Libbfd) find_package(Libbfd)
endif() endif()
find_package(LibXml2 REQUIRED) find_package(LibXml2 REQUIRED)
find_package(BZip2 REQUIRED)
find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(Python 3 REQUIRED COMPONENTS Interpreter Development)
find_package(PythonSitePackages REQUIRED) find_package(PythonSitePackages REQUIRED)
find_package(BISON REQUIRED) find_package(BISON REQUIRED)

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

@ -5,6 +5,7 @@
${CRLCORE_SOURCE_DIR}/src/ccore/bookshelf ${CRLCORE_SOURCE_DIR}/src/ccore/bookshelf
${CRLCORE_SOURCE_DIR}/src/ccore/alliance/ap ${CRLCORE_SOURCE_DIR}/src/ccore/alliance/ap
${CRLCORE_SOURCE_DIR}/src/ccore/alliance/vst ${CRLCORE_SOURCE_DIR}/src/ccore/alliance/vst
${QtX_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${CONFIGURATION_INCLUDE_DIR} ${CONFIGURATION_INCLUDE_DIR}
${HURRICANE_INCLUDE_DIR} ${HURRICANE_INCLUDE_DIR}
@ -34,22 +35,22 @@
add_library( libmanager ${cpps} ${moccpps} ) add_library( libmanager ${cpps} ${moccpps} )
set_target_properties( libmanager PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties( libmanager PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries( libmanager crlcore #target_link_libraries( libmanager crlcore
${HURRICANE_PYTHON_LIBRARIES} # ${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES} # ${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_LIBRARIES} # ${HURRICANE_LIBRARIES}
${BOOKSHELF_LIBRARY} # ${BOOKSHELF_LIBRARY}
${CONFIGURATION_LIBRARY} # ${CONFIGURATION_LIBRARY}
${CIF_LIBRARY} # ${CIF_LIBRARY}
${AGDS_LIBRARY} # ${AGDS_LIBRARY}
${UTILITIES_LIBRARY} # ${UTILITIES_LIBRARY}
${LEFDEF_LIBRARIES} # ${LEFDEF_LIBRARIES}
${OA_LIBRARIES} # ${OA_LIBRARIES}
${QtX_LIBRARIES} # ${QtX_LIBRARIES}
${Boost_LIBRARIES} # ${Boost_LIBRARIES}
${LIBXML2_LIBRARIES} # ${LIBXML2_LIBRARIES}
${PYTHON_LIBRARIES} -lutil # ${PYTHON_LIBRARIES} -lutil
) # )
install( TARGETS libmanager DESTINATION lib${LIB_SUFFIX} ) install( TARGETS libmanager DESTINATION lib${LIB_SUFFIX} )
install( FILES ${includes} ${mocincludes} DESTINATION include/coriolis2/crlcore ) install( FILES ${includes} ${mocincludes} DESTINATION include/coriolis2/crlcore )

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

@ -31,7 +31,7 @@
${HURRICANE_INCLUDE_DIR} ${HURRICANE_INCLUDE_DIR}
${Python_INCLUDE_DIRS} ${Python_INCLUDE_DIRS}
${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIR}
${QtX_INCLUDE_DIR} ${QtX_INCLUDE_DIRS}
) )
add_definitions ( -DCORIOLIS_TOP="${CORIOLIS_TOP}" add_definitions ( -DCORIOLIS_TOP="${CORIOLIS_TOP}"
@ -272,6 +272,13 @@
qtX_wrap_cpp ( moc_cpps ${mocincludes} ) qtX_wrap_cpp ( moc_cpps ${mocincludes} )
set_property ( SOURCE ${VstParserGrammarCpp}
${VstParserScannerCpp}
${AcmSigdaParserGrammarCpp}
${AcmSigdaParserScannerCpp}
${IocParserGrammarCpp}
${IocParserScannerCpp}
PROPERTY SKIP_AUTOMOC ON)
add_library ( crlcore ${ccore_cpps} add_library ( crlcore ${ccore_cpps}
${moc_cpps} ${moc_cpps}
@ -296,18 +303,18 @@
${openaccess_cpps} ${openaccess_cpps}
) )
set_target_properties ( crlcore PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties ( crlcore PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries ( crlcore ${HURRICANE_PYTHON_NEW_LIBRARIES} # target_link_libraries ( crlcore ${HURRICANE_PYTHON_NEW_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES} # ${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES} # ${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_LIBRARIES} # ${HURRICANE_LIBRARIES}
${BOOKSHELF_LIBRARY} # ${BOOKSHELF_LIBRARY}
${LEFDEF_LIBRARIES} # ${LEFDEF_LIBRARIES}
${OA_LIBRARIES} # ${OA_LIBRARIES}
${QtX_LIBRARIES} # ${QtX_LIBRARIES}
${Boost_LIBRARIES} # ${Boost_LIBRARIES}
${LIBXML2_LIBRARIES} # ${LIBXML2_LIBRARIES}
${PYTHON_LIBRARIES} -lutil # ${PYTHON_LIBRARIES} -lutil
) # )
install ( TARGETS crlcore DESTINATION lib${LIB_SUFFIX} ) install ( TARGETS crlcore DESTINATION lib${LIB_SUFFIX} )
install ( FILES ${includes} ${mocincludes} DESTINATION include/coriolis2/crlcore ) install ( FILES ${includes} ${mocincludes} DESTINATION include/coriolis2/crlcore )

6
crlcore/src/cyclop/CMakeLists.txt
View File

@ -3,7 +3,7 @@
include_directories ( ${CRLCORE_SOURCE_DIR}/src/ccore include_directories ( ${CRLCORE_SOURCE_DIR}/src/ccore
${HURRICANE_INCLUDE_DIR} ${HURRICANE_INCLUDE_DIR}
${UTILITIES_INCLUDE_DIR} ${UTILITIES_INCLUDE_DIR}
${QtX_INCLUDE_DIR} ${QtX_INCLUDE_DIRS}
${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIR}
) )
@ -22,9 +22,9 @@
add_executable ( cyclop ${cpps} ${moccpps} ) add_executable ( cyclop ${cpps} ${moccpps} )
target_link_libraries ( cyclop crlcore target_link_libraries ( cyclop crlcore
${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_PYTHON_NEW_LIBRARIES} ${HURRICANE_PYTHON_NEW_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES} ${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_LIBRARIES} ${HURRICANE_LIBRARIES}
${BOOKSHELF_LIBRARY} ${BOOKSHELF_LIBRARY}
${LEFDEF_LIBRARIES} ${LEFDEF_LIBRARIES}
@ -34,8 +34,10 @@
${Python_LIBRARIES} ${Python_LIBRARIES}
-lutil -lutil
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${BZIP2_LIBRARIES}
${LIBEXECINFO_LIBRARIES} ${LIBEXECINFO_LIBRARIES}
${LIBBFD_LIBRARIES} ${LIBBFD_LIBRARIES}
z
) )
install ( TARGETS cyclop DESTINATION bin ) install ( TARGETS cyclop DESTINATION bin )

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

@ -19,6 +19,7 @@
${CONFIGURATION_INCLUDE_DIR} ${CONFIGURATION_INCLUDE_DIR}
${Python_INCLUDE_DIRS} ${Python_INCLUDE_DIRS}
${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIR}
${QtX_INCLUDE_DIRS}
) )
add_definitions( -DCORIOLIS_TOP="${CORIOLIS_TOP}" add_definitions( -DCORIOLIS_TOP="${CORIOLIS_TOP}"
@ -72,9 +73,25 @@
crlcore/PyLefImport.h crlcore/PyLefImport.h
crlcore/PyDefImport.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 set( depLibs crlcore
${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_PYTHON_NEW_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES} ${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_LIBRARIES}
${LEFDEF_LIBRARIES}
${PYTHON_LIBRARIES} ${PYTHON_LIBRARIES}
${QtX_LIBRARIES}
-lutil -lutil
) )

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

@ -3,7 +3,7 @@
include_directories ( ${CRLCORE_SOURCE_DIR}/src/ccore include_directories ( ${CRLCORE_SOURCE_DIR}/src/ccore
${HURRICANE_INCLUDE_DIR} ${HURRICANE_INCLUDE_DIR}
${UTILITIES_INCLUDE_DIR} ${UTILITIES_INCLUDE_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIR}
) )
set ( cpps x2y.cpp ) set ( cpps x2y.cpp )
@ -11,9 +11,9 @@
add_executable ( cx2y ${cpps} ) add_executable ( cx2y ${cpps} )
target_link_libraries ( cx2y crlcore target_link_libraries ( cx2y crlcore
${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_PYTHON_NEW_LIBRARIES} ${HURRICANE_PYTHON_NEW_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES} ${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_LIBRARIES} ${HURRICANE_LIBRARIES}
${BOOKSHELF_LIBRARY} ${BOOKSHELF_LIBRARY}
${LEFDEF_LIBRARIES} ${LEFDEF_LIBRARIES}
@ -23,7 +23,9 @@
${Python_LIBRARIES} ${Python_LIBRARIES}
-lutil -lutil
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${BZIP2_LIBRARIES}
${LIBEXECINFO_LIBRARIES} ${LIBEXECINFO_LIBRARIES}
${LIBBFD_LIBRARIES} ${LIBBFD_LIBRARIES}
z
) )
install ( TARGETS cx2y DESTINATION bin ) install ( TARGETS cx2y DESTINATION bin )

34
equinox/src/CMakeLists.txt
View File

@ -6,7 +6,7 @@
${HURRICANE_INCLUDE_DIR} ${HURRICANE_INCLUDE_DIR}
${CORIOLIS_INCLUDE_DIR} ${CORIOLIS_INCLUDE_DIR}
${UTILITIES_INCLUDE_DIR} ${UTILITIES_INCLUDE_DIR}
${QtX_INCLUDE_DIR} ${QtX_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
) )
@ -40,25 +40,25 @@
add_library ( intervalTree ${intervalTreeCpps} ) add_library ( intervalTree ${intervalTreeCpps} )
set_target_properties ( intervalTree PROPERTIES VERSION 1.0 SOVERSION 1 ) 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} ) add_library ( equinox ${cpps} ${mocCpps} )
set_target_properties ( equinox PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties ( equinox PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries ( equinox intervalTree #target_link_libraries ( equinox intervalTree
${CORIOLIS_LIBRARIES} # ${CORIOLIS_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES} # ${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES} # ${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_LIBRARIES} # ${HURRICANE_LIBRARIES}
${CONFIGURATION_LIBRARY} # ${CONFIGURATION_LIBRARY}
${CIF_LIBRARY} # ${CIF_LIBRARY}
${AGDS_LIBRARY} # ${AGDS_LIBRARY}
${LEFDEF_LIBRARIES} # ${LEFDEF_LIBRARIES}
${OA_LIBRARIES} # ${OA_LIBRARIES}
${QtX_LIBRARIES} # ${QtX_LIBRARIES}
${Boost_LIBRARIES} # ${Boost_LIBRARIES}
${LIBXML2_LIBRARIES} # ${LIBXML2_LIBRARIES}
${PYTHON_LIBRARIES} -lutil # ${PYTHON_LIBRARIES} -lutil
) # )
install ( TARGETS equinox intervalTree DESTINATION lib${LIB_SUFFIX} ) install ( TARGETS equinox intervalTree DESTINATION lib${LIB_SUFFIX} )
install ( FILES ${includes} install ( FILES ${includes}

2
etesian/src/CMakeLists.txt
View File

@ -64,7 +64,7 @@
add_library( etesian ${cpps} ${mocCpps} ${pyCpps} ) add_library( etesian ${cpps} ${mocCpps} ${pyCpps} )
set_target_properties( etesian PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties( etesian PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries( etesian ${depLibs} ) #target_link_libraries( etesian ${depLibs} )
add_python_module( "${pyCpps}" add_python_module( "${pyCpps}"
"${pyIncludes}" "${pyIncludes}"

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

@ -164,7 +164,7 @@
add_library( analog ${cpps} ${pyCpps} ) add_library( analog ${cpps} ${pyCpps} )
set_target_properties( analog PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties( analog PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries( analog ${depLibs} ) #target_link_libraries( analog ${depLibs} )
add_python_module( "${pyCpps}" add_python_module( "${pyCpps}"
"${pyIncludes}" "${pyIncludes}"

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

@ -1,5 +1,6 @@
message( "Python_INCLUDE_DIRS=${Python_INCLUDE_DIRS}" ) message( "Python_INCLUDE_DIRS=${Python_INCLUDE_DIRS}" )
message( "QtX_INCLUDE_DIRS=${QtX_INCLUDE_DIRS}" )
include_directories( ${HURRICANE_SOURCE_DIR}/src/utilities include_directories( ${HURRICANE_SOURCE_DIR}/src/utilities
${HURRICANE_SOURCE_DIR}/src/hurricane ${HURRICANE_SOURCE_DIR}/src/hurricane
${HURRICANE_SOURCE_DIR}/src/configuration ${HURRICANE_SOURCE_DIR}/src/configuration
@ -83,28 +84,21 @@
add_library( configuration ${cpps} ${mocCpps} ${RCC_SRCS} ) add_library( configuration ${cpps} ${mocCpps} ${RCC_SRCS} )
set_target_properties( configuration PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties( configuration PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries( configuration hurricane
${QtX_LIBRARIES}
${PYTHON_LIBRARIES}
)
add_library( pytypemanager ${pyTypeCpps} ) add_library( pytypemanager ${pyTypeCpps} )
set_target_properties( pytypemanager PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties( pytypemanager PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries( pytypemanager hurricane
${PYTHON_LIBRARIES}
)
add_python_module3( "${pyCfgCpps}" add_python_module3( "${pyCfgCpps}"
"${pyCfgIncludes}" "${pyCfgIncludes}"
Cfg Cfg
"pytypemanager;configuration" "pytypemanager;configuration;hurricane;${QtX_LIBRARIES};${PYTHON_LIBRARIES}"
include/coriolis2/hurricane/configuration include/coriolis2/hurricane/configuration
) )
add_python_module3( "${pyHurricane3Cpps}" add_python_module3( "${pyHurricane3Cpps}"
"${pyHurricane3Includes}" "${pyHurricane3Includes}"
Hurricane3 Hurricane3
"pytypemanager;configuration" "pytypemanager;configuration;hurricane;${PYTHON_LIBRARIES}"
include/coriolis2/hurricane/configuration include/coriolis2/hurricane/configuration
) )

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

@ -146,7 +146,7 @@
add_library( viewer ${cpps} ${MOC_SRCS} ${RCC_SRCS} ${pyCpps} ) add_library( viewer ${cpps} ${MOC_SRCS} ${RCC_SRCS} ${pyCpps} )
set_target_properties( viewer PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties( viewer PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries( viewer ${depLibs} ) #target_link_libraries( viewer ${depLibs} )
add_python_module( "${pyCpps}" add_python_module( "${pyCpps}"
"${pyIncludes}" "${pyIncludes}"

2
hurricane/src/viewer/PyHApplication.cpp
View File

@ -142,7 +142,7 @@ extern "C" {
}; };
DirectDeleteMethod(PyHApplication_DeAlloc,PyHApplication) PythonOnlyDeleteMethod(HApplication)
PyTypeObjectLinkPyType(HApplication) PyTypeObjectLinkPyType(HApplication)

4
katabatic/src/CMakeLists.txt
View File

@ -11,7 +11,7 @@ endif ( CHECK_DETERMINISM )
${KNIK_INCLUDE_DIR} ${KNIK_INCLUDE_DIR}
${CONFIGURATION_INCLUDE_DIR} ${CONFIGURATION_INCLUDE_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${QtX_INCLUDE_DIR} ${QtX_INCLUDE_DIRS}
${Python_INCLUDE_DIRS} ${Python_INCLUDE_DIRS}
) )
set( includes katabatic/Constants.h set( includes katabatic/Constants.h
@ -78,7 +78,7 @@ endif ( CHECK_DETERMINISM )
add_library( katabatic ${cpps} ) add_library( katabatic ${cpps} )
set_target_properties( katabatic PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties( katabatic PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries( katabatic ${depLibs} ) #target_link_libraries( katabatic ${depLibs} )
add_python_module( "${pyCpps}" add_python_module( "${pyCpps}"
"${pyIncludes}" "${pyIncludes}"

1
katana/CMakeLists.txt
View File

@ -29,6 +29,7 @@
find_package(CORIOLIS REQUIRED) find_package(CORIOLIS REQUIRED)
find_package(ANABATIC REQUIRED) find_package(ANABATIC REQUIRED)
find_package(ETESIAN REQUIRED) find_package(ETESIAN REQUIRED)
find_package(COLOQUINTE REQUIRED)
find_package(Doxygen) find_package(Doxygen)
if(CHECK_DATABASE) if(CHECK_DATABASE)

5
katana/src/CMakeLists.txt
View File

@ -8,7 +8,7 @@
${HURRICANE_INCLUDE_DIR} ${HURRICANE_INCLUDE_DIR}
${CONFIGURATION_INCLUDE_DIR} ${CONFIGURATION_INCLUDE_DIR}
${FLUTE_INCLUDE_DIR} ${FLUTE_INCLUDE_DIR}
${WtX_INCLUDE_DIR} ${QtX_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${Python_INCLUDE_DIRS} ${Python_INCLUDE_DIRS}
) )
@ -101,6 +101,7 @@
${BOOKSHELF_LIBRARY} ${BOOKSHELF_LIBRARY}
${CIF_LIBRARY} ${CIF_LIBRARY}
${AGDS_LIBRARY} ${AGDS_LIBRARY}
${COLOQUINTE_LIBRARIES}
${UTILITIES_LIBRARY} ${UTILITIES_LIBRARY}
${FLUTE_LIBRARIES} ${FLUTE_LIBRARIES}
${LEFDEF_LIBRARIES} ${LEFDEF_LIBRARIES}
@ -114,7 +115,7 @@
add_library( katana ${cpps} ${mocCpps} ${pyCpps} ) add_library( katana ${cpps} ${mocCpps} ${pyCpps} )
set_target_properties( katana PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties( katana PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries( katana ${depLibs} ) #target_link_libraries( katana ${depLibs} )
add_python_module( "${pyCpps}" add_python_module( "${pyCpps}"
"${pyIncludes}" "${pyIncludes}"

4
kite/src/CMakeLists.txt
View File

@ -8,7 +8,7 @@
${HURRICANE_INCLUDE_DIR} ${HURRICANE_INCLUDE_DIR}
${CONFIGURATION_INCLUDE_DIR} ${CONFIGURATION_INCLUDE_DIR}
${FLUTE_INCLUDE_DIR} ${FLUTE_INCLUDE_DIR}
${WtX_INCLUDE_DIR} ${QtX_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${Python_INCLUDE_DIRS} ${Python_INCLUDE_DIRS}
) )
@ -100,7 +100,7 @@
add_library( kite ${cpps} ${mocCpps} ${pyCpps} ) add_library( kite ${cpps} ${mocCpps} ${pyCpps} )
set_target_properties( kite PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties( kite PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries( kite ${depLibs} ) #target_link_libraries( kite ${depLibs} )
add_python_module( "${pyCpps}" add_python_module( "${pyCpps}"
"${pyIncludes}" "${pyIncludes}"

34
knik/src/CMakeLists.txt
View File

@ -45,23 +45,23 @@
add_library ( knik ${cpps} ${mocCpps} ) add_library ( knik ${cpps} ${mocCpps} )
set_target_properties ( knik PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties ( knik PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries ( knik ${FLUTE_LIBRARY} #target_link_libraries ( knik ${FLUTE_LIBRARY}
${CORIOLIS_LIBRARIES} # ${CORIOLIS_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES} # ${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES} # ${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_LIBRARIES} # ${HURRICANE_LIBRARIES}
${CONFIGURATION_LIBRARY} # ${CONFIGURATION_LIBRARY}
${CIF_LIBRARY} # ${CIF_LIBRARY}
${AGDS_LIBRARY} # ${AGDS_LIBRARY}
${UTILITIES_LIBRARY} # ${UTILITIES_LIBRARY}
${FLUTE_LIBRARIES} # ${FLUTE_LIBRARIES}
${LEFDEF_LIBRARIES} # ${LEFDEF_LIBRARIES}
${OA_LIBRARIES} # ${OA_LIBRARIES}
${QtX_LIBRARIES} # ${QtX_LIBRARIES}
${Boost_LIBRARIES} # ${Boost_LIBRARIES}
${LIBXML2_LIBRARIES} # ${LIBXML2_LIBRARIES}
${PYTHON_LIBRARIES} -lutil # ${PYTHON_LIBRARIES} -lutil
) # )
install ( TARGETS knik DESTINATION lib${LIB_SUFFIX} ) install ( TARGETS knik DESTINATION lib${LIB_SUFFIX} )
install ( FILES ${includes} install ( FILES ${includes}

2
lefdef/src/def/defzlib/CMakeLists.txt
View File

@ -11,7 +11,7 @@
) )
add_library ( defzlib ${cpps} ) 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 ) set_target_properties ( defzlib PROPERTIES VERSION 5.8 SOVERSION 5 )
install ( TARGETS defzlib DESTINATION lib${LIB_SUFFIX} ) install ( TARGETS defzlib DESTINATION lib${LIB_SUFFIX} )

2
lefdef/src/lef/lefzlib/CMakeLists.txt
View File

@ -11,7 +11,7 @@
) )
add_library ( lefzlib ${cpps} ) 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 ) set_target_properties ( lefzlib PROPERTIES VERSION 5.8 SOVERSION 5 )
install ( TARGETS lefzlib DESTINATION lib${LIB_SUFFIX} ) install ( TARGETS lefzlib DESTINATION lib${LIB_SUFFIX} )

38
mauka/src/CMakeLists.txt
View File

@ -50,31 +50,31 @@
add_library ( mauka ${cpps} ${mocCpps} ${pyCpps} ) add_library ( mauka ${cpps} ${mocCpps} ${pyCpps} )
set_target_properties ( mauka PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties ( mauka PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries ( mauka ${METIS_LIBRARIES} #target_link_libraries ( mauka ${METIS_LIBRARIES}
${NIMBUS_LIBRARIES} # ${NIMBUS_LIBRARIES}
${CORIOLIS_LIBRARIES} # ${CORIOLIS_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES} # ${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES} # ${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_LIBRARIES} # ${HURRICANE_LIBRARIES}
${CONFIGURATION_LIBRARY} # ${CONFIGURATION_LIBRARY}
${CIF_LIBRARY} # ${CIF_LIBRARY}
${AGDS_LIBRARY} # ${AGDS_LIBRARY}
${LEFDEF_LIBRARIES} # ${LEFDEF_LIBRARIES}
${OA_LIBRARIES} # ${OA_LIBRARIES}
${QtX_LIBRARIES} # ${QtX_LIBRARIES}
${Boost_LIBRARIES} # ${Boost_LIBRARIES}
${LIBXML2_LIBRARIES} # ${LIBXML2_LIBRARIES}
${PYTHON_LIBRARIES} -lutil # ${PYTHON_LIBRARIES} -lutil
) # )
add_library ( pyMauka MODULE ${pyCpps} ) add_library ( pyMauka MODULE ${pyCpps} )
set_target_properties ( pyMauka PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1" set_target_properties ( pyMauka PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1"
PREFIX "" PREFIX ""
OUTPUT_NAME "Mauka" OUTPUT_NAME "Mauka"
) )
target_link_libraries ( pyMauka mauka #target_link_libraries ( pyMauka mauka
${CORIOLIS_PYTHON_LIBRARIES} # ${CORIOLIS_PYTHON_LIBRARIES}
) # )
install ( TARGETS mauka DESTINATION lib${LIB_SUFFIX} ) install ( TARGETS mauka DESTINATION lib${LIB_SUFFIX} )
install ( TARGETS pyMauka DESTINATION ${PYTHON_SITE_PACKAGES} ) install ( TARGETS pyMauka DESTINATION ${PYTHON_SITE_PACKAGES} )

38
metis/src/CMakeLists.txt
View File

@ -30,31 +30,31 @@ endif ( HMETIS_FOUND )
add_library ( metis ${cpps} ${pyCpps} ) add_library ( metis ${cpps} ${pyCpps} )
set_target_properties ( metis PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties ( metis PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries ( metis ${HMETIS_LIBRARIES} #target_link_libraries ( metis ${HMETIS_LIBRARIES}
${NIMBUS_LIBRARIES} # ${NIMBUS_LIBRARIES}
${CORIOLIS_LIBRARIES} # ${CORIOLIS_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES} # ${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES} # ${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_LIBRARIES} # ${HURRICANE_LIBRARIES}
${CONFIGURATION_LIBRARY} # ${CONFIGURATION_LIBRARY}
${CIF_LIBRARY} # ${CIF_LIBRARY}
${AGDS_LIBRARY} # ${AGDS_LIBRARY}
${LEFDEF_LIBRARIES} # ${LEFDEF_LIBRARIES}
${OA_LIBRARIES} # ${OA_LIBRARIES}
${QT_LIBRARIES} # ${QT_LIBRARIES}
${Boost_LIBRARIES} # ${Boost_LIBRARIES}
${LIBXML2_LIBRARIES} # ${LIBXML2_LIBRARIES}
${PYTHON_LIBRARIES} -lutil # ${PYTHON_LIBRARIES} -lutil
) # )
add_library ( pyMetis MODULE ${pyCpps} ) add_library ( pyMetis MODULE ${pyCpps} )
set_target_properties ( pyMetis PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1" set_target_properties ( pyMetis PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1"
PREFIX "" PREFIX ""
OUTPUT_NAME "Metis" OUTPUT_NAME "Metis"
) )
target_link_libraries ( pyMetis metis #target_link_libraries ( pyMetis metis
${CORIOLIS_PYTHON_LIBRARIES} # ${CORIOLIS_PYTHON_LIBRARIES}
) # )
install ( TARGETS metis DESTINATION lib${LIB_SUFFIX} ) install ( TARGETS metis DESTINATION lib${LIB_SUFFIX} )
install ( TARGETS pyMetis DESTINATION ${PYTHON_SITE_PACKAGES} ) install ( TARGETS pyMetis DESTINATION ${PYTHON_SITE_PACKAGES} )

34
nimbus/src/CMakeLists.txt
View File

@ -45,29 +45,29 @@
add_library ( nimbus ${cpps} ${pyCpps} ) add_library ( nimbus ${cpps} ${pyCpps} )
set_target_properties ( nimbus PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties ( nimbus PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries ( nimbus ${CORIOLIS_LIBRARIES} #target_link_libraries ( nimbus ${CORIOLIS_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES} # ${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES} # ${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_LIBRARIES} # ${HURRICANE_LIBRARIES}
${CONFIGURATION_LIBRARY} # ${CONFIGURATION_LIBRARY}
${CIF_LIBRARY} # ${CIF_LIBRARY}
${AGDS_LIBRARY} # ${AGDS_LIBRARY}
${LEFDEF_LIBRARIES} # ${LEFDEF_LIBRARIES}
${OA_LIBRARIES} # ${OA_LIBRARIES}
${QtX_LIBRARIES} # ${QtX_LIBRARIES}
${Boost_LIBRARIES} # ${Boost_LIBRARIES}
${LIBXML2_LIBRARIES} # ${LIBXML2_LIBRARIES}
${PYTHON_LIBRARIES} -lutil # ${PYTHON_LIBRARIES} -lutil
) # )
add_library ( pyNimbus MODULE ${pyCpps} ) add_library ( pyNimbus MODULE ${pyCpps} )
set_target_properties ( pyNimbus PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1" set_target_properties ( pyNimbus PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1"
PREFIX "" PREFIX ""
OUTPUT_NAME "Nimbus" OUTPUT_NAME "Nimbus"
) )
target_link_libraries ( pyNimbus nimbus #target_link_libraries ( pyNimbus nimbus
${CORIOLIS_PYTHON_LIBRARIES} # ${CORIOLIS_PYTHON_LIBRARIES}
) # )
install ( TARGETS nimbus DESTINATION lib${LIB_SUFFIX} ) install ( TARGETS nimbus DESTINATION lib${LIB_SUFFIX} )
install ( TARGETS pyNimbus DESTINATION ${PYTHON_SITE_PACKAGES} ) install ( TARGETS pyNimbus DESTINATION ${PYTHON_SITE_PACKAGES} )

32
solstice/src/CMakeLists.txt
View File

@ -6,7 +6,7 @@
${EQUINOX_INCLUDE_DIR} ${EQUINOX_INCLUDE_DIR}
${CORIOLIS_INCLUDE_DIR} ${CORIOLIS_INCLUDE_DIR}
${UTILITIES_INCLUDE_DIR} ${UTILITIES_INCLUDE_DIR}
${QtX_INCLUDE_DIR} ${QtX_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
) )
@ -42,21 +42,21 @@
add_library ( solstice ${cpps} ${mocCpps} ) add_library ( solstice ${cpps} ${mocCpps} )
set_target_properties ( solstice PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties ( solstice PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries ( solstice ${EQUINOX_LIBRARIES} #target_link_libraries ( solstice ${EQUINOX_LIBRARIES}
${CORIOLIS_LIBRARIES} # ${CORIOLIS_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES} # ${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES} # ${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_LIBRARIES} # ${HURRICANE_LIBRARIES}
${CONFIGURATION_LIBRARY} # ${CONFIGURATION_LIBRARY}
${CIF_LIBRARY} # ${CIF_LIBRARY}
${AGDS_LIBRARY} # ${AGDS_LIBRARY}
${LEFDEF_LIBRARIES} # ${LEFDEF_LIBRARIES}
${OA_LIBRARIES} # ${OA_LIBRARIES}
${QtX_LIBRARIES} # ${QtX_LIBRARIES}
${Boost_LIBRARIES} # ${Boost_LIBRARIES}
${LIBXML2_LIBRARIES} # ${LIBXML2_LIBRARIES}
${PYTHON_LIBRARIES} -lutil # ${PYTHON_LIBRARIES} -lutil
) # )
install ( TARGETS solstice DESTINATION lib${LIB_SUFFIX} ) install ( TARGETS solstice DESTINATION lib${LIB_SUFFIX} )
install ( FILES ${includes} install ( FILES ${includes}

4
tutorial/src/CMakeLists.txt
View File

@ -5,7 +5,7 @@
${CORIOLIS_INCLUDE_DIR} ${CORIOLIS_INCLUDE_DIR}
${HURRICANE_INCLUDE_DIR} ${HURRICANE_INCLUDE_DIR}
${CONFIGURATION_INCLUDE_DIR} ${CONFIGURATION_INCLUDE_DIR}
${QtX_INCLUDE_DIR} ${QtX_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${Python_INCLUDE_DIRS} ${Python_INCLUDE_DIRS}
) )
@ -46,7 +46,7 @@
add_library( tutorial ${cpps} ${mocCpps} ${pyCpps} ) add_library( tutorial ${cpps} ${mocCpps} ${pyCpps} )
set_target_properties( tutorial PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties( tutorial PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries( tutorial ${depLibs} ) #target_link_libraries( tutorial ${depLibs} )
add_python_module( "${pyCpps}" add_python_module( "${pyCpps}"
"${pyIncludes}" "${pyIncludes}"

1
unicorn/CMakeLists.txt
View File

@ -24,6 +24,7 @@
find_package(Libbfd) find_package(Libbfd)
endif() endif()
find_package(LibXml2 REQUIRED) find_package(LibXml2 REQUIRED)
find_package(BZip2 REQUIRED)
find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(Python 3 REQUIRED COMPONENTS Interpreter Development)
find_package(PythonSitePackages REQUIRED) find_package(PythonSitePackages REQUIRED)
find_package(LEFDEF REQUIRED) find_package(LEFDEF REQUIRED)

5
unicorn/src/CMakeLists.txt
View File

@ -14,7 +14,7 @@
${CORIOLIS_INCLUDE_DIR} ${CORIOLIS_INCLUDE_DIR}
${BOOKSHELF_INCLUDE_DIR} ${BOOKSHELF_INCLUDE_DIR}
${CONFIGURATION_INCLUDE_DIR} ${CONFIGURATION_INCLUDE_DIR}
${QtX_INCLUDE_DIR} ${QtX_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${LEFDEF_INCLUDE_DIR} ${LEFDEF_INCLUDE_DIR}
${Python_INCLUDE_DIRS} ${Python_INCLUDE_DIRS}
@ -80,12 +80,13 @@
${Python_LIBRARIES} ${Python_LIBRARIES}
-lutil -lutil
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${BZIP2_LIBRARIES}
${LIBBFD_LIBRARIES} ${LIBBFD_LIBRARIES}
) )
add_library( unicorn ${cpps} ${mocCpps} ${pyCpps} ) add_library( unicorn ${cpps} ${mocCpps} ${pyCpps} )
set_target_properties( unicorn PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties( unicorn PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries( unicorn ${depLibs} ) #target_link_libraries( unicorn ${depLibs} )
add_python_module( "${pyCpps}" add_python_module( "${pyCpps}"
"${pyIncludes}" "${pyIncludes}"

1
unittests/CMakeLists.txt
View File

@ -26,6 +26,7 @@
find_package(Libbfd) find_package(Libbfd)
endif() endif()
find_package(Libexecinfo REQUIRED) find_package(Libexecinfo REQUIRED)
find_package(BZip2 REQUIRED)
find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(Python 3 REQUIRED COMPONENTS Interpreter Development)
find_package(PythonSitePackages REQUIRED) find_package(PythonSitePackages REQUIRED)
find_package(LEFDEF) find_package(LEFDEF)

5
unittests/src/CMakeLists.txt
View File

@ -3,7 +3,7 @@
include_directories ( ${CORIOLIS_INCLUDE_DIR} include_directories ( ${CORIOLIS_INCLUDE_DIR}
${HURRICANE_INCLUDE_DIR} ${HURRICANE_INCLUDE_DIR}
${UTILITIES_INCLUDE_DIR} ${UTILITIES_INCLUDE_DIR}
${QtX_INCLUDE_DIR} ${QtX_INCLUDE_DIRS}
${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIR}
) )
@ -21,8 +21,8 @@ endif()
add_executable ( unittests ${cpps} ) add_executable ( unittests ${cpps} )
target_link_libraries ( unittests ${CORIOLIS_PYTHON_LIBRARIES} target_link_libraries ( unittests ${CORIOLIS_PYTHON_LIBRARIES}
${CORIOLIS_LIBRARIES} ${CORIOLIS_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES} ${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_LIBRARIES} ${HURRICANE_LIBRARIES}
${BOOKSHELF_LIBRARY} ${BOOKSHELF_LIBRARY}
${AGDS_LIBRARY} ${AGDS_LIBRARY}
@ -35,6 +35,7 @@ endif()
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${Python_LIBRARIES} ${Python_LIBRARIES}
-lutil -lutil
${BZIP2_LIBRARIES}
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${LIBEXECINFO_LIBRARIES} ${LIBEXECINFO_LIBRARIES}
${LIBBFD_LIBRARIES} ${LIBBFD_LIBRARIES}

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

@ -24,7 +24,7 @@
) )
set ( testcpps BookshelfTkMain.cpp ) set ( testcpps BookshelfTkMain.cpp )
add_library ( bookshelf ${cpps} ) add_library ( bookshelf ${cpps} )
target_link_libraries ( bookshelf vlsisapdutils ) #target_link_libraries ( bookshelf vlsisapdutils )
set_target_properties ( bookshelf PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties ( bookshelf PROPERTIES VERSION 1.0 SOVERSION 1 )
add_executable ( bookshelf-tk ${testcpps} ) 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})

22
vlsisapd/src/configuration/src/CMakeLists.txt
View File

@ -41,12 +41,12 @@
add_library ( configuration ${cpps} ${mocCpps} ${RCC_SRCS} ) add_library ( configuration ${cpps} ${mocCpps} ${RCC_SRCS} )
set_target_properties ( configuration PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties ( configuration PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries ( configuration vlsisapdutils #target_link_libraries ( configuration vlsisapdutils
${QtX_LIBRARIES} # ${QtX_LIBRARIES}
${PYTHON_LIBRARIES} # ${PYTHON_LIBRARIES}
${LIBXML2_LIBRARIES} # ${LIBXML2_LIBRARIES}
${Boost_LIBRARIES} # ${Boost_LIBRARIES}
) # )
if (Boost_FOUND) if (Boost_FOUND)
add_library ( pyConfiguration MODULE ${pycpps}) add_library ( pyConfiguration MODULE ${pycpps})
@ -54,11 +54,11 @@
OUTPUT_NAME "Cfg" OUTPUT_NAME "Cfg"
PREFIX "" PREFIX ""
) )
target_link_libraries ( pyConfiguration configuration #target_link_libraries ( pyConfiguration configuration
${PYTHON_LIBRARIES} # ${PYTHON_LIBRARIES}
${LIBXML2_LIBRARIES} # ${LIBXML2_LIBRARIES}
${Boost_LIBRARIES} # ${Boost_LIBRARIES}
) # )
install ( TARGETS pyConfiguration DESTINATION ${PYTHON_SITE_PACKAGES} ) install ( TARGETS pyConfiguration DESTINATION ${PYTHON_SITE_PACKAGES} )
endif(Boost_FOUND) endif(Boost_FOUND)

6
vlsisapd/src/liberty/src/CMakeLists.txt
View File

@ -54,8 +54,8 @@ add_library ( liberty ${cpps}
${liberty_parser_cpps} ${liberty_parser_cpps}
) )
set_target_properties ( liberty PROPERTIES VERSION 1.0 SOVERSION 1) 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 ( TARGETS liberty DESTINATION lib${LIB_SUFFIX} )
install ( FILES ${includes} DESTINATION include/vlsisapd/liberty ) install ( FILES ${includes} DESTINATION include/vlsisapd/liberty )
@ -66,6 +66,6 @@ if ( Boost_FOUND )
OUTPUT_NAME "LIBERTY" OUTPUT_NAME "LIBERTY"
PREFIX "" 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} ) install ( TARGETS pyLIBERTY DESTINATION ${PYTHON_SITE_PACKAGES} )
endif ( Boost_FOUND ) endif ( Boost_FOUND )