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

diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake
index f140447..80997c0 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)
@@ -5,7 +7,9 @@ IF(USE_VTK)
   FIND_PACKAGE(VTK)
   # If vtk found
   IF(VTK_FOUND)
-    MESSAGE ( STATUS "VTK FOUND - VERSION = ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}")
+    MESSAGE ( STATUS "Looking for VTK... found")
+    MESSAGE ( STATUS "* Dir     = ${VTK_DIR}")
+    MESSAGE ( STATUS "* Version = ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}")
     INCLUDE(${VTK_USE_FILE})
     ADD_DEF( _USE_VTK_ )
     SET(BBTK_VTK_LIBRARIES
@@ -29,7 +33,9 @@ IF(USE_ITK)
   FIND_PACKAGE(ITK)
   # If itk found
   IF(ITK_FOUND)
-     MESSAGE ( STATUS "ITK FOUND - VERSION = ${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}.${ITK_VERSION_PATCH}")
+    MESSAGE ( STATUS "Looking for ITK... found")
+    MESSAGE ( STATUS "* Dir     = ${ITK_DIR}")
+    MESSAGE ( STATUS "* Version = ${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}.${ITK_VERSION_PATCH}")
     INCLUDE(${ITK_USE_FILE})
     ADD_DEF( _USE_ITK_ )
     SET(BBTK_ITK_LIBRARIES
@@ -98,6 +104,7 @@ IF(USE_ITK)
 ENDIF(USE_ITK)
 #-----------------------------------------------------------------------------
 
+
 #-----------------------------------------------------------------------------
 #OPTION(USE_GDCM "Build GDCM-based black boxes" OFF)
 IF(USE_GDCM)
@@ -107,21 +114,38 @@ IF(USE_GDCM)
   IF(GDCM_FOUND)
     INCLUDE(${GDCM_USE_FILE})
     ADD_DEF( _USE_GDCM_ )
+
+    MESSAGE ( STATUS "Looking for GDCM... found")
+    MESSAGE ( STATUS "* Dir       = ${GDCM_DIR}")
+    MESSAGE ( STATUS "* Version   = ${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")
+    MESSAGE ( STATUS "* Namespace = ${GDCM_NAME_SPACE}")
+
+    # Test that GDCM_NAME_SPACE is **NOT** "gdcm" or will conflict with 
+    # embedded gdcm in ITK and will result in hard seg faults !
+    IF (GDCM_NAME_SPACE STREQUAL "gdcm")
+      MESSAGE(FATAL_ERROR "GDCM_NAME_SPACE value is 'gdcm' which conflicts with ITK embededd gdcm namespace : rebuild gdcm with another GDCM_NAME_SPACE value")
+    ENDIF (GDCM_NAME_SPACE STREQUAL "gdcm")
+
+    MARK_AS_ADVANCED(GDCM_DIR)
     
     SET(BBTK_GDCM_LIBRARIES
 # TO DO : USE GDCM LINK LIBRARIES !!!
-       gdcm  gdcmjpeg8  gdcmjpeg12  gdcmjpeg16
+# IF gdcm WAS NOT COMPILE WITH VTK THE ABOVE FORCED LINK WITH vtkgdcm DOES NOT WORK
+        ${GDCM_LIBRARIES} 
+#gdcm  gdcmjpeg8  gdcmjpeg12  gdcmjpeg16
       )
 
-     IF(USE_VTK )
-         SET(BBTK_GDCM_LIBRARIES
-  	           ${BBTK_GDCM_LIBRARIES}
-                   vtkgdcm  
-         )
-     ENDIF(USE_VTK)
+	  
+#     IF(USE_VTK )
+#         SET(BBTK_GDCM_LIBRARIES
+#  	           ${BBTK_GDCM_LIBRARIES}
+#                   vtkgdcm  
+#         )
+#     ENDIF(USE_VTK)
 
   ENDIF(GDCM_FOUND)
 ENDIF(USE_GDCM)
+
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -156,7 +180,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 +190,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)
 #-----------------------------------------------------------------------------