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:56 +00:00
parent 6b5169d021
commit 8914dd118e
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ispd/CMakeLists.txt
View File

@ -52,18 +52,21 @@ SETUP_PROJECT_PATHS(CORIOLIS)
SET(QT_USE_QTXML "true") SET(QT_USE_QTXML "true")
FIND_PACKAGE(LibXml2 REQUIRED)
FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project
FIND_PACKAGE(LEFDEF REQUIRED) FIND_PACKAGE(PythonLibs REQUIRED)
FIND_PACKAGE(PythonSitePackages REQUIRED)
FIND_PACKAGE(VLSISAPD REQUIRED) FIND_PACKAGE(VLSISAPD REQUIRED)
FIND_PACKAGE(HURRICANE REQUIRED) FIND_PACKAGE(HURRICANE REQUIRED)
FIND_PACKAGE(CORIOLIS REQUIRED) FIND_PACKAGE(CORIOLIS REQUIRED)
FIND_PACKAGE(KNIK REQUIRED) FIND_PACKAGE(KNIK REQUIRED)
FIND_PACKAGE(LEFDEF REQUIRED)
#FIND_PACKAGE(KATABATIC REQUIRED) #FIND_PACKAGE(KATABATIC REQUIRED)
#FIND_PACKAGE(KITE REQUIRED) #FIND_PACKAGE(KITE REQUIRED)
#FIND_PACKAGE(EQUINOX REQUIRED) #FIND_PACKAGE(EQUINOX REQUIRED)
#FIND_PACKAGE(SOLSTICE REQUIRED) #FIND_PACKAGE(SOLSTICE REQUIRED)
SET_LIB_LINK_MODE() 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)
ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(src)

8
ispd/src/CMakeLists.txt
View File

@ -20,13 +20,19 @@
${KNIK_LIBRARIES} ${KNIK_LIBRARIES}
${CORIOLIS_LIBRARIES} ${CORIOLIS_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES} ${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_LIBRARIES} ${HURRICANE_LIBRARIES}
${CONFIGURATION_LIBRARY} ${CONFIGURATION_LIBRARY}
${AGDS_LIBRARY} ${AGDS_LIBRARY}
${CIF_LIBRARY} ${CIF_LIBRARY}
${CONFIGURATION_LIBRARY}
${OA_LIBRARIES} ${OA_LIBRARIES}
${LEFDEF_LIBRARIES} ${LEFDEF_LIBRARIES}
${QT_LIBRARIES} ${QT_LIBRARIES}
${Boost_LIBRARIES} ) ${Boost_LIBRARIES}
${PYTHON_LIBRARIES}
-lutil
${LIBXML2_LIBRARIES}
)
install ( TARGETS ispd DESTINATION bin ) install ( TARGETS ispd DESTINATION bin )