From 748d54b5494fb619325140d56aa9d92d40f15760 Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Mon, 12 Jul 2010 15:12:45 +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.

---
 equinox/CMakeLists.txt     |  8 ++++++++
 equinox/src/CMakeLists.txt | 19 +++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/equinox/CMakeLists.txt b/equinox/CMakeLists.txt
index 873cd311..5cea35e3 100644
--- a/equinox/CMakeLists.txt
+++ b/equinox/CMakeLists.txt
@@ -39,6 +39,14 @@ FIND_PACKAGE(HURRICANE REQUIRED)
 FIND_PACKAGE(CORIOLIS 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/equinox/src/CMakeLists.txt b/equinox/src/CMakeLists.txt
index 0a454d4a..87b01bf5 100644
--- a/equinox/src/CMakeLists.txt
+++ b/equinox/src/CMakeLists.txt
@@ -35,8 +35,23 @@
                    set ( intervalTreeCpps     intervalTree/src/IntervalTree.cpp )
           qt4_wrap_cpp ( mocCpps       ${mocIncludes} )
 
-           add_library ( equinox        ${cpps} ${mocCpps} )
-           add_library (intervalTree    ${intervalTreeCpps} )
+           add_library ( equinox       ${cpps} ${mocCpps} )
+ target_link_libraries ( equinox       ${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
+                       )
+           add_library ( intervalTree   ${intervalTreeCpps} )
+
                install ( TARGETS        equinox intervalTree DESTINATION lib${LIB_SUFFIX} )
                install ( FILES          ${includes}
                                         ${mocIncludes}