X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage.cmake;h=765363528bd5ad1e33bcedf0063459e35b719505;hb=67837fa48c205487fbb9e5d6134d028c142867bc;hp=a4104a446834cc8e110386b5aa812d1f904a57cc;hpb=a16b50b85de5ca6a4dfdfbc5656b490e0d358f52;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index a4104a4..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)
@@ -107,14 +118,49 @@ IF(${BBTK_PACKAGE_NAME}_USE_ITK)
     )
 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}
     ${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
@@ -162,11 +208,11 @@ 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 "=======================================")