X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKFindLibraries.cmake;h=f86e7f8292b0636f330314fc3a6bf52a18f1ac1d;hb=ba235cfa6ce74178ab468c01af002af0ab3a7d82;hp=f140447fdb1fa5781a2a7d1aa12af60f8e065c7c;hpb=7a26044dd46cb80ab90ee1f63d3b4d8ce52b2d39;p=bbtk.git

diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake
index f140447..f86e7f8 100644
--- a/kernel/cmake/BBTKFindLibraries.cmake
+++ b/kernel/cmake/BBTKFindLibraries.cmake
@@ -1,3 +1,5 @@
+
+
 #-----------------------------------------------------------------------------
 #OPTION(USE_VTK "Build VTK-based black boxes" OFF)
 IF(USE_VTK)
@@ -156,7 +158,7 @@ ENDIF(USE_LATEX)
 
 #-----------------------------------------------------------------------------
 IF(USE_TTH) 
-  FIND_FILE(LATEX_tth_CONVERTER NAME tth tth.exe PATHS . c:/Creatis/tth_exe/ ~/Creatis/tth ~/Creatis/tth_linux)
+  FIND_FILE(LATEX_tth_CONVERTER NAME tth tth.exe PATHS . $ENV{CREATIS}/tth_exe/ ~/Creatis/tth ~/Creatis/tth_linux)
   IF (NOT LATEX_tth_CONVERTER)
     MESSAGE(FATAL_ERROR "TTH not found (LATEX_tth_CONVERTER). Required to build the HTML documentation from tex source")
   ELSE (NOT LATEX_tth_CONVERTER)
@@ -166,17 +168,32 @@ IF(USE_TTH)
 ENDIF(USE_TTH)
 #-----------------------------------------------------------------------------
 
-
 #-----------------------------------------------------------------------------
-# TO DO : FIND BOOST 
-SET(USE_BOOST TRUE)
 IF(USE_BOOST)
-  FIND_PACKAGE(Boost REQUIRED)
-  MESSAGE(STATUS "Looking for boost C++ library... - found in ${Boost_INCLUDE_DIRS}")
-  INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-  LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS} )
-  SET(BBTK_BOOST_LIBRARIES
-    boost_signals
-    )  
+  IF(BBTK_USE_SHIPPED_BOOST)
+    MESSAGE(STATUS "bbtk uses shipped boost C++ library (${BBTK_SHIPPED_BOOST})")
+    INCLUDE_DIRECTORIES( 
+      ${PROJECT_SOURCE_DIR}/kernel/src/ThirdParty/${BBTK_SHIPPED_BOOST})
+
+    # TO DO : CLEANLY BLOCK auto_link.hpp INCLUSION 
+    #ADD_DEF(BOOST_SIGNALS_NO_LIB)
+    SET(BBTK_BOOST_LIBRARIES
+      bbtk_boost_signals
+      )  
+
+  ELSE(BBTK_USE_SHIPPED_BOOST)
+    FIND_PACKAGE(Boost REQUIRED)
+    MARK_AS_ADVANCED(Boost_INCLUDE_DIR)
+    IF(Boost_FOUND)
+      MESSAGE(STATUS "Looking for boost C++ library... - found in ${Boost_INCLUDE_DIR}")
+      INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+      LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS} )
+      SET(BBTK_BOOST_LIBRARIES
+	boost_signals
+	)
+    ELSE(Boost_FOUND)
+      MESSAGE(FATAL_ERRO "boost C++ library not found - either set Boost_INCLUDE_DIR or set BBTK_USE_SHIPPED_BOOST to ON to use shipped ${BBTK_SHIPPED_BOOST}")
+    ENDIF(Boost_FOUND)
+  ENDIF(BBTK_USE_SHIPPED_BOOST)
 ENDIF(USE_BOOST)
 #-----------------------------------------------------------------------------