X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage.cmake;h=765363528bd5ad1e33bcedf0063459e35b719505;hb=73c50056dc4c352c2cc2209a12533e5566a32b06;hp=bdace25040be3765620d378e76e40fff9a6a57a7;hpb=70db75992e0ccf5ad1fab5ccf9cec013877ea3d5;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index bdace25..7653635 100644
--- a/kernel/cmake/BBTKConfigurePackage.cmake
+++ b/kernel/cmake/BBTKConfigurePackage.cmake
@@ -1,3 +1,14 @@
+# ==================================
+#           W A R N I N G !
+# ==================================
+#
+# This file is dupplicated as BBTKConfigurePackage2.cmake
+#
+# Only ONE commented out line, in BBTKConfigurePackage2.cmake differs
+# :-(
+# In case of modification, mind to modify BBTKConfigurePackage2.cmake as well!
+#
+
 
 MESSAGE(STATUS "")
 MESSAGE(STATUS "=======================================")
@@ -39,7 +50,7 @@ IF(NOT BBTK_CORE_PACKAGE)
     )
   IF (WIN32)
     INSTALL ( FILES ${${BBTK_PACKAGE_NAME}_BINARY_DIR}/bbtkPackage
-      DESTINATION "" )
+      DESTINATION "." )
   ENDIF (WIN32)
   #---------------------------------------------------------------------------
 ELSE(NOT BBTK_CORE_PACKAGE)
@@ -95,7 +106,7 @@ IF(${BBTK_PACKAGE_NAME}_USE_VTK)
   SET(USE_VTK ON CACHE BOOL "Use VTK" FORCE)
   SET(${BBTK_PACKAGE_NAME}_LIBS
     ${${BBTK_PACKAGE_NAME}_LIBS}
-    ${BBTK_VTK_LIBRARIES}
+    ${VTK_LIBRARIES}
     )
 ENDIF(${BBTK_PACKAGE_NAME}_USE_VTK)
 
@@ -103,23 +114,58 @@ IF(${BBTK_PACKAGE_NAME}_USE_ITK)
   SET(USE_ITK ON CACHE BOOL "Use ITK" FORCE)
   SET(${BBTK_PACKAGE_NAME}_LIBS
     ${${BBTK_PACKAGE_NAME}_LIBS}
-    ${BBTK_ITK_LIBRARIES}
+    ${ITK_LIBRARIES}
     )
 ENDIF(${BBTK_PACKAGE_NAME}_USE_ITK)
 
+IF(${BBTK_PACKAGE_NAME}_USE_QT)
+  SET(USE_QT4 ON CACHE BOOL "Use QT" FORCE)
+  SET(${BBTK_PACKAGE_NAME}_LIBS
+    ${${BBTK_PACKAGE_NAME}_LIBS}
+    ${QT_LIBRARIES}
+    )
+ENDIF(${BBTK_PACKAGE_NAME}_USE_QT)
+
+#----------
+
 IF(${BBTK_PACKAGE_NAME}_USE_GDCM)
-  SET(USE_GDCM ON CACHE BOOL "Use GDCM" FORCE)
+  SET(USE_GDCM ON CACHE BOOL "Use GDCM" )
+  SET(USE_GDCM2 OFF CACHE BOOL "Use GDCM2" )
+  SET(USE_GDCM_VTK ON CACHE BOOL "Use GDCM_VTK" FORCE)
   SET(${BBTK_PACKAGE_NAME}_LIBS
     ${${BBTK_PACKAGE_NAME}_LIBS}
-    ${BBTK_GDCM_LIBRARIES}
+    ${GDCM_LIBRARIES}
     )
+	IF(USE_GDCM)
+		IF(USE_GDCM2)
+		message(FATAL_ERROR "You cannot select both GDCM and GDCM2 (DICOM library readers)")
+		ENDIF(USE_GDCM2)
+	ENDIF(USE_GDCM)
 ENDIF(${BBTK_PACKAGE_NAME}_USE_GDCM)
 
+#----------
+
+IF(${BBTK_PACKAGE_NAME}_USE_GDCM2)
+  SET(USE_GDCM2 ON CACHE BOOL "Use GDCM2" FORCE)
+  SET(USE_GDCM2_VTK ON CACHE BOOL "Use GDCM2_VTK" FORCE)
+  SET(${BBTK_PACKAGE_NAME}_LIBS
+    ${${BBTK_PACKAGE_NAME}_LIBS}
+    ${GDCM2_LIBRARIES}
+    )
+	IF(USE_GDCM2)
+		IF(USE_GDCM)
+		message(FATAL_ERROR "You cannot select both GDCM and GDCM2 (DICOM library readers)")
+		ENDIF(USE_GDCM)
+	ENDIF(USE_GDCM2)
+ENDIF(${BBTK_PACKAGE_NAME}_USE_GDCM2)
+
+#----------
+
 IF(${BBTK_PACKAGE_NAME}_USE_GSMIS)
   SET(USE_GSMIS ON CACHE BOOL "Use GSMIS" FORCE)
   SET(${BBTK_PACKAGE_NAME}_LIBS
     ${${BBTK_PACKAGE_NAME}_LIBS}
-    ${BBTK_GSMIS_LIBRARIES}
+    ${GSMIS_LIBRARIES}
     )
 ENDIF(${BBTK_PACKAGE_NAME}_USE_GSMIS)
 
@@ -131,7 +177,7 @@ IF(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS)
     IF(WIN32)
       SET(${BBTK_PACKAGE_NAME}_LIBS
         ${${BBTK_PACKAGE_NAME}_LIBS}
-        ${BBTK_WXWIDGETS_LIBRARIES}
+        ${WXWIDGETS_LIBRARIES}
         )
     ENDIF(WIN32)
   ELSE(BBTK_CORE_PACKAGE)
@@ -144,7 +190,7 @@ IF(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS)
       IF(WIN32)
         SET(${BBTK_PACKAGE_NAME}_LIBS
           ${${BBTK_PACKAGE_NAME}_LIBS}
-          ${BBTK_WXWIDGETS_LIBRARIES}
+          ${WXWIDGETS_LIBRARIES}
           )
       ENDIF(WIN32)
     ENDIF(NOT BBTK_BUILT_WITH_WX)
@@ -154,14 +200,19 @@ ENDIF(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS)
 
 #---------------------------------------------------------------------------
 
-
+MESSAGE(STATUS "")
+MESSAGE(STATUS "=======================================")
+MESSAGE(STATUS "${BBTK_PACKAGE_NAME} link libraries:")
+MESSAGE(STATUS "${${BBTK_PACKAGE_NAME}_LIBS}")
+MESSAGE(STATUS "=======================================")
+MESSAGE(STATUS "")
 
 #---------------------------------------------------------------------------
-# Recurse into subdirs
-SUBDIRS(src)
-SUBDIRS(doc)
-SUBDIRS(bbs)
-SUBDIRS(data)
+# Recurse into ADD_SUBDIRECTORY
+ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(doc)
+ADD_SUBDIRECTORY(bbs)
+ADD_SUBDIRECTORY(data)
 #---------------------------------------------------------------------------
 
 MESSAGE(STATUS "=======================================")