From 0d9f40e720c284b3f8ccf82e85641086ba3bd8d5 Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Thu, 1 Jul 2010 11:50:15 +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.

---
 kite/CMakeLists.txt     |  5 ++++-
 kite/src/CMakeLists.txt | 17 +++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/kite/CMakeLists.txt b/kite/CMakeLists.txt
index 477670f6..46bd4098 100644
--- a/kite/CMakeLists.txt
+++ b/kite/CMakeLists.txt
@@ -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)
diff --git a/kite/src/CMakeLists.txt b/kite/src/CMakeLists.txt
index 11d61576..ee69a592 100644
--- a/kite/src/CMakeLists.txt
+++ b/kite/src/CMakeLists.txt
@@ -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 )