From 8914dd118e4c795fbf40cfdd9399f8596d88b74b Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Thu, 1 Jul 2010 11:50:56 +0000
Subject: [PATCH]   * 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.

---
 ispd/CMakeLists.txt     | 7 +++++--
 ispd/src/CMakeLists.txt | 8 +++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ispd/CMakeLists.txt b/ispd/CMakeLists.txt
index 00ce93f0..a3c30395 100644
--- a/ispd/CMakeLists.txt
+++ b/ispd/CMakeLists.txt
@@ -52,18 +52,21 @@ SETUP_PROJECT_PATHS(CORIOLIS)
 
 SET(QT_USE_QTXML "true")
 
+FIND_PACKAGE(LibXml2 REQUIRED)
 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(HURRICANE REQUIRED)
 FIND_PACKAGE(CORIOLIS REQUIRED)
 FIND_PACKAGE(KNIK REQUIRED)
+FIND_PACKAGE(LEFDEF REQUIRED)
 #FIND_PACKAGE(KATABATIC REQUIRED)
 #FIND_PACKAGE(KITE REQUIRED)
 #FIND_PACKAGE(EQUINOX REQUIRED)
 #FIND_PACKAGE(SOLSTICE 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)
 
 ADD_SUBDIRECTORY(src)
diff --git a/ispd/src/CMakeLists.txt b/ispd/src/CMakeLists.txt
index 4bc02cdf..4df21482 100644
--- a/ispd/src/CMakeLists.txt
+++ b/ispd/src/CMakeLists.txt
@@ -20,13 +20,19 @@
                                      ${KNIK_LIBRARIES}
                                      ${CORIOLIS_LIBRARIES}
                                      ${HURRICANE_GRAPHICAL_LIBRARIES}
+                                     ${HURRICANE_PYTHON_LIBRARIES}
                                      ${HURRICANE_LIBRARIES}
                                      ${CONFIGURATION_LIBRARY}
                                      ${AGDS_LIBRARY}
                                      ${CIF_LIBRARY}
+                                     ${CONFIGURATION_LIBRARY}
                                      ${OA_LIBRARIES}
                                      ${LEFDEF_LIBRARIES}
                                      ${QT_LIBRARIES}
-                                     ${Boost_LIBRARIES} )
+                                     ${Boost_LIBRARIES}
+                                     ${PYTHON_LIBRARIES}
+                                     -lutil
+                                     ${LIBXML2_LIBRARIES}
+                       )
                install ( TARGETS     ispd DESTINATION bin )