From 51cb105f4c9622075dfa873c465d867db91a5061 Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Mon, 12 Jul 2010 15:13:09 +0000
Subject: [PATCH]   * All tools:     - Bug: target_link_libraries() must be put
 back for OSX Snow Leopard         (doesn't seems to affect Leopard). As I do
 not have an OSX under         my hand it's untested and is likely to fail at
 that point.

---
 solstice/CMakeLists.txt     |  8 ++++++++
 solstice/src/CMakeLists.txt | 16 ++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/solstice/CMakeLists.txt b/solstice/CMakeLists.txt
index a708d6a9..25292fe0 100644
--- a/solstice/CMakeLists.txt
+++ b/solstice/CMakeLists.txt
@@ -41,6 +41,14 @@ FIND_PACKAGE(CORIOLIS REQUIRED)
 FIND_PACKAGE(EQUINOX REQUIRED)
 
 SET_LIB_LINK_MODE()
+SET(Boost_USE_STATIC_LIBS ON)
+MESSAGE(STATUS "Always uses Boost static libraries.")
+FIND_PACKAGE(Boost 1.35.0 COMPONENTS program_options filesystem system regex python)
+IF(NOT Boost_FOUND)
+  FIND_PACKAGE(Boost 1.33.1 COMPONENTS program_options filesystem python regex REQUIRED)
+ENDIF(NOT Boost_FOUND)
+MESSAGE(STATUS "Found Boost libraries ${Boost_LIB_VERSION} in ${Boost_INCLUDE_DIR}")
+MESSAGE(STATUS "  ${Boost_LIBRARIES}")
 
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(cmake_modules)
diff --git a/solstice/src/CMakeLists.txt b/solstice/src/CMakeLists.txt
index 6c2fd370..621a9afd 100644
--- a/solstice/src/CMakeLists.txt
+++ b/solstice/src/CMakeLists.txt
@@ -37,6 +37,22 @@
           qt4_wrap_cpp ( mocCpps       ${mocIncludes} )
 
            add_library ( solstice       ${cpps} ${mocCpps} )
+ target_link_libraries ( solstice       ${EQUINOX_LIBRARIES}
+                                        ${CORIOLIS_LIBRARIES}
+                                        ${HURRICANE_PYTHON_LIBRARIES}
+                                        ${HURRICANE_GRAPHICAL_LIBRARIES}
+                                        ${HURRICANE_LIBRARIES}
+                                        ${CONFIGURATION_LIBRARY}
+                                        ${CIF_LIBRARY}
+                                        ${AGDS_LIBRARY}
+                                        ${LEFDEF_LIBRARIES}
+                                        ${OA_LIBRARIES}
+                                        ${QT_LIBRARIES}
+                                        ${Boost_LIBRARIES}
+                                        ${LIBXML2_LIBRARIES}
+                                        ${PYTHON_LIBRARIES} -lutil
+                       )
+
                install ( TARGETS        solstice DESTINATION lib${LIB_SUFFIX} )
                install ( FILES          ${includes}
                                         ${mocIncludes} DESTINATION include/coriolis2/solstice )