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

* All tools: 

- Library linking: there must not be "target_link_library()" for libraries,
        only when building binaries. Avoid clashes between static module
        or class variables, and strange reinitialisation of those variables.
    - Change: Boost is now always linked staticly.
This commit is contained in:
Jean-Paul Chaput 2010-07-01 11:50:15 +00:00
parent 125a38c3c7
commit 0d9f40e720
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kite/CMakeLists.txt
View File

@ -44,7 +44,10 @@ SET(QT_USE_QTXML "true")
IF(BUILD_DOC)
FIND_PACKAGE(Doxygen)
ENDIF(BUILD_DOC)
FIND_PACKAGE(LibXml2 REQUIRED)
FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project
FIND_PACKAGE(PythonLibs REQUIRED)
FIND_PACKAGE(PythonSitePackages REQUIRED)
FIND_PACKAGE(VLSISAPD REQUIRED)
FIND_PACKAGE(LEFDEF REQUIRED)
FIND_PACKAGE(HURRICANE REQUIRED)
@ -53,7 +56,7 @@ FIND_PACKAGE(KNIK REQUIRED)
FIND_PACKAGE(KATABATIC REQUIRED)
SET_LIB_LINK_MODE()
FIND_PACKAGE(Boost 1.33.1 COMPONENTS program_options REQUIRED)
FIND_PACKAGE(Boost 1.33.1 COMPONENTS program_options filesystem REQUIRED)
IF(CHECK_DATABASE)
ADD_DEFINITIONS(-DCHECK_DATABASE)

17
kite/src/CMakeLists.txt
View File

@ -67,24 +67,14 @@
add_library ( kite ${cpps} ${mocCpps} )
target_link_libraries ( kite ${KATABATIC_LIBRARIES}
${KNIK_LIBRARIES}
${CORIOLIS_LIBRARIES}
${HURRICANE_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES}
${CIF_LIBRARY}
${AGDS_LIBRARY}
${QT_LIBRARIES}
${LEFDEF_LIBRARIES}
${OA_LIBRARIES}
)
add_executable ( kite-text ${kitecpps} )
target_link_libraries ( kite-text kite
${KATABATIC_LIBRARIES}
${KNIK_LIBRARIES}
${CORIOLIS_LIBRARIES}
${HURRICANE_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_LIBRARIES}
${CIF_LIBRARY}
${AGDS_LIBRARY}
${CONFIGURATION_LIBRARY}
@ -92,6 +82,9 @@
${LEFDEF_LIBRARIES}
${OA_LIBRARIES}
${Boost_LIBRARIES}
${PYTHON_LIBRARIES}
-lutil
${LIBXML2_LIBRARIES}
)
install ( TARGETS kite DESTINATION lib${LIB_SUFFIX} )
install ( TARGETS kite-text DESTINATION bin )