* 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.

knik/CMakeLists.txt

@@ -46,6 +46,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.32.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)

knik/src/CMakeLists.txt

@@ -41,10 +41,24 @@
           qt4_wrap_cpp ( mocCpps       ${mocIncludes} )
 
 
-           add_library ( knik         ${cpps} ${mocCpps} )
            add_library ( flute        ${fluteCpps} )
-               install ( TARGETS      knik flute DESTINATION lib${LIB_SUFFIX} )
+           add_library ( knik         ${cpps} ${mocCpps} )
+ target_link_libraries ( knik         flute
+                                      ${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      knik flute DESTINATION lib${LIB_SUFFIX} )
                install ( FILES ${includes}
                                ${mocIncludes}
                                ${fluteIncludes} DESTINATION include/coriolis2/knik )