Preapre use of GDCM2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c928b8c88a891433a54ecd3e9f2debc5325dfbd..53fce69e499832cacb1a637911cd98e3291d6d64 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,14 @@ PROJECT(bbtk)
 INCLUDE(kernel/cmake/BBTKRootCMakeLists.cmake NO_POLICY_SCOPE )
 #-----------------------------------------------------------------------------
 
+OPTION(USE_GDCM "Use gdcm 1.3" ON)
+OPTION(USE_GDCM2 "Use gdcm 2.0.14 at least" OFF)
+ MESSAGE(STATUS "GDCM LIB ....= ${GDCM_LIBRARIES}")
+IF(USE_GDCM2)
+       #OPTION(USE_GDCM_ANOM "use gdcm2 anonymizer tool" OFF)
+       #TO DO TEST IF GDCM_USE_SYSTEM_OPENSSL is valid
+ENDIF(USE_GDCM2)
+
 #-----------------------------------------------------------------------------
 # The toolkit kernel (bbtk lib; appli : bbi, bbfy; docs; ...)
 ADD_SUBDIRECTORY(kernel)

diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index f92766f9e1d68737bf5dae2f069213d029f132a0..f72ccd4531575254779d24898b5c6d6e4ded56fe 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage.cmake
+++ b/kernel/cmake/BBTKConfigurePackage.cmake
@@ -124,6 +124,16 @@ IF(${BBTK_PACKAGE_NAME}_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}
+    )
+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

diff --git a/kernel/cmake/BBTKConfigurePackage_PackageConfig.cmake b/kernel/cmake/BBTKConfigurePackage_PackageConfig.cmake
index ccf3cb94691920444b1b9e669cd98723b191ef1e..429cbf0289c5b68064e22cf0dc09c09c28b99d24 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage_PackageConfig.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_PackageConfig.cmake
@@ -27,7 +27,11 @@ IF(FIND_PACKAGE_VERBOSE)
   IF(${BBTK_PACKAGE_NAME}_USE_GDCM)      
     SET(DEPS "${DEPS} gdcm")
   ENDIF(${BBTK_PACKAGE_NAME}_USE_GDCM)      
-  
+
+  IF(${BBTK_PACKAGE_NAME}_USE_GDCM2)      
+    SET(DEPS "${DEPS} gdcm2")
+  ENDIF(${BBTK_PACKAGE_NAME}_USE_GDCM2)
+     
   IF(${BBTK_PACKAGE_NAME}_USE_GSMIS)
     SET(DEPS "${DEPS} gsmis")
   ENDIF(${BBTK_PACKAGE_NAME}_USE_GSMIS)

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index 52f062f024ae10171bbc8854aaa67df13656b86d..83ccbf838e30722d2eed3c7313b46057830ac48d 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -212,11 +212,12 @@ SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${BBTK_PACKAGE_LIB_PATH}
 
 # Additional config/use
 # Prepare for configure
-SET(BBTK_PACKAGE_USE_VTK ${${BBTK_PACKAGE_NAME}_USE_VTK})
-SET(BBTK_PACKAGE_USE_ITK ${${BBTK_PACKAGE_NAME}_USE_ITK})
-SET(BBTK_PACKAGE_USE_QT ${${BBTK_PACKAGE_NAME}_USE_QT})
-SET(BBTK_PACKAGE_USE_GDCM ${${BBTK_PACKAGE_NAME}_USE_GDCM})
-SET(BBTK_PACKAGE_USE_GSMIS ${${BBTK_PACKAGE_NAME}_USE_GSMIS})
+SET(BBTK_PACKAGE_USE_VTK       ${${BBTK_PACKAGE_NAME}_USE_VTK})
+SET(BBTK_PACKAGE_USE_ITK       ${${BBTK_PACKAGE_NAME}_USE_ITK})
+SET(BBTK_PACKAGE_USE_QT        ${${BBTK_PACKAGE_NAME}_USE_QT})
+SET(BBTK_PACKAGE_USE_GDCM      ${${BBTK_PACKAGE_NAME}_USE_GDCM})
+SET(BBTK_PACKAGE_USE_GDCM2     ${${BBTK_PACKAGE_NAME}_USE_GDCM2})
+SET(BBTK_PACKAGE_USE_GSMIS     ${${BBTK_PACKAGE_NAME}_USE_GSMIS})
 SET(BBTK_PACKAGE_USE_WXWIDGETS ${${BBTK_PACKAGE_NAME}_USE_WXWIDGETS})
 SET(BBTK_PACKAGE_USE_PACKAGES  ${${BBTK_PACKAGE_NAME}_USE_PACKAGES})
 SET(BBTK_PACKAGE_INCLUDE_DIRS  ${${BBTK_PACKAGE_NAME}_INCLUDE_DIRS})

diff --git a/packages/appli/CMakeLists.txt b/packages/appli/CMakeLists.txt
index 5b41a14c781c861161fcefbff0393f3c635caa12..915fbc0479e1c29e91ad49df9b9e27009fe665f7 100644 (file)
--- a/packages/appli/CMakeLists.txt
+++ b/packages/appli/CMakeLists.txt
@@ -35,11 +35,13 @@ SET(${BBTK_PACKAGE_NAME}_BUILD_VERSION 0)
 
 #===========================================================================
 # UNCOMMENT EACH LIBRARY NEEDED (WILL BE FOUND AND USED AUTOMATICALLY)
-# SET(${BBTK_PACKAGE_NAME}_USE_VTK  ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_ITK  ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_GDCM ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_GDCM_VTK ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_GSMIS ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_VTK       ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_ITK       ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM      ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM2     ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM_VTK  ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM2_VTK ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GSMIS     ON)
 # SET(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS ON)
 #===========================================================================
 

diff --git a/packages/appli/PackageConfig.cmake.in b/packages/appli/PackageConfig.cmake.in
index 0ade94bf9aaaf8ad67ed0efa85f67e2990fd149c..c1b0355e3c5fb77a14e4816ef6306aded1f70ef4 100644 (file)
--- a/packages/appli/PackageConfig.cmake.in
+++ b/packages/appli/PackageConfig.cmake.in
@@ -5,6 +5,7 @@ SET(BBTK_PACKAGE_NAME                 @BBTK_PACKAGE_NAME@)
 SET(@BBTK_PACKAGE_NAME@_USE_VTK       @BBTK_PACKAGE_USE_VTK@)
 SET(@BBTK_PACKAGE_NAME@_USE_ITK       @BBTK_PACKAGE_USE_ITK@)
 SET(@BBTK_PACKAGE_NAME@_USE_GDCM      @BBTK_PACKAGE_USE_GDCM@)
+SET(@BBTK_PACKAGE_NAME@_USE_GDCM2     @BBTK_PACKAGE_USE_GDCM2@)
 SET(@BBTK_PACKAGE_NAME@_USE_GSMIS     @BBTK_PACKAGE_USE_GSMIS@)
 SET(@BBTK_PACKAGE_NAME@_USE_WXWIDGETS @BBTK_PACKAGE_USE_WXWIDGETS@)
 SET(@BBTK_PACKAGE_NAME@_USE_PACKAGES  @BBTK_PACKAGE_USE_PACKAGES@)

diff --git a/packages/demo/PackageConfig.cmake.in b/packages/demo/PackageConfig.cmake.in
index 0ade94bf9aaaf8ad67ed0efa85f67e2990fd149c..c1b0355e3c5fb77a14e4816ef6306aded1f70ef4 100644 (file)
--- a/packages/demo/PackageConfig.cmake.in
+++ b/packages/demo/PackageConfig.cmake.in
@@ -5,6 +5,7 @@ SET(BBTK_PACKAGE_NAME                 @BBTK_PACKAGE_NAME@)
 SET(@BBTK_PACKAGE_NAME@_USE_VTK       @BBTK_PACKAGE_USE_VTK@)
 SET(@BBTK_PACKAGE_NAME@_USE_ITK       @BBTK_PACKAGE_USE_ITK@)
 SET(@BBTK_PACKAGE_NAME@_USE_GDCM      @BBTK_PACKAGE_USE_GDCM@)
+SET(@BBTK_PACKAGE_NAME@_USE_GDCM2     @BBTK_PACKAGE_USE_GDCM2@)
 SET(@BBTK_PACKAGE_NAME@_USE_GSMIS     @BBTK_PACKAGE_USE_GSMIS@)
 SET(@BBTK_PACKAGE_NAME@_USE_WXWIDGETS @BBTK_PACKAGE_USE_WXWIDGETS@)
 SET(@BBTK_PACKAGE_NAME@_USE_PACKAGES  @BBTK_PACKAGE_USE_PACKAGES@)

diff --git a/packages/gdcmvtk/CMakeLists.txt b/packages/gdcmvtk/CMakeLists.txt
index b6fc7eaaec19a8ba5038ecf6c8f9843340a02f74..d1fd44d7a75df1d29b717fbf98131049c5944679 100644 (file)
--- a/packages/gdcmvtk/CMakeLists.txt
+++ b/packages/gdcmvtk/CMakeLists.txt
@@ -39,8 +39,17 @@ SET(${BBTK_PACKAGE_NAME}_BUILD_VERSION 0)
 # UNCOMMENT EACH LIBRARY NEEDED (WILL BE FOUND AND USED AUTOMATICALLY)
  SET(${BBTK_PACKAGE_NAME}_USE_VTK  ON)
 # SET(${BBTK_PACKAGE_NAME}_USE_ITK  ON)
+
+IF(USE_GDCM)
  SET(${BBTK_PACKAGE_NAME}_USE_GDCM ON)
  SET(${BBTK_PACKAGE_NAME}_USE_GDCM_VTK ON)
+ENDIF(USE_GDCM)
+
+IF(USE_GDCM2)
+ SET(${BBTK_PACKAGE_NAME}_USE_GDCM2 ON)
+ SET(${BBTK_PACKAGE_NAME}_USE_GDCM2_VTK ON)
+ENDIF(USE_GDCM2)
+
 # SET(${BBTK_PACKAGE_NAME}_USE_GSMIS ON)
 # SET(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS ON)
 # SET(${BBTK_PACKAGE_NAME}_USE_KWWIDGETS ON)

diff --git a/packages/gdcmvtk/PackageConfig.cmake.in b/packages/gdcmvtk/PackageConfig.cmake.in
index 0ade94bf9aaaf8ad67ed0efa85f67e2990fd149c..c1b0355e3c5fb77a14e4816ef6306aded1f70ef4 100644 (file)
--- a/packages/gdcmvtk/PackageConfig.cmake.in
+++ b/packages/gdcmvtk/PackageConfig.cmake.in
@@ -5,6 +5,7 @@ SET(BBTK_PACKAGE_NAME                 @BBTK_PACKAGE_NAME@)
 SET(@BBTK_PACKAGE_NAME@_USE_VTK       @BBTK_PACKAGE_USE_VTK@)
 SET(@BBTK_PACKAGE_NAME@_USE_ITK       @BBTK_PACKAGE_USE_ITK@)
 SET(@BBTK_PACKAGE_NAME@_USE_GDCM      @BBTK_PACKAGE_USE_GDCM@)
+SET(@BBTK_PACKAGE_NAME@_USE_GDCM2     @BBTK_PACKAGE_USE_GDCM2@)
 SET(@BBTK_PACKAGE_NAME@_USE_GSMIS     @BBTK_PACKAGE_USE_GSMIS@)
 SET(@BBTK_PACKAGE_NAME@_USE_WXWIDGETS @BBTK_PACKAGE_USE_WXWIDGETS@)
 SET(@BBTK_PACKAGE_NAME@_USE_PACKAGES  @BBTK_PACKAGE_USE_PACKAGES@)

diff --git a/packages/itk/CMakeLists.txt b/packages/itk/CMakeLists.txt
index 72aff186c80855e509b877d41a634b4e7df5c814..6a123ede874918871e2fd18167a1d3930eeff539 100644 (file)
--- a/packages/itk/CMakeLists.txt
+++ b/packages/itk/CMakeLists.txt
@@ -14,9 +14,10 @@ SET(BBTK_PACKAGE_NAME itk)
 
 #===========================================================================
 # UNCOMMENT EACH LIBRARY NEEDED
-# SET(${BBTK_PACKAGE_NAME}_USE_VTK  ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_VTK   ON)
 SET(${BBTK_PACKAGE_NAME}_USE_ITK  ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_GDCM ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM  ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM2 ON)
 # SET(${BBTK_PACKAGE_NAME}_USE_GSMIS ON)
 # SET(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS ON)
 #===========================================================================

diff --git a/packages/itk/PackageConfig.cmake.in b/packages/itk/PackageConfig.cmake.in
index 0ade94bf9aaaf8ad67ed0efa85f67e2990fd149c..c1b0355e3c5fb77a14e4816ef6306aded1f70ef4 100644 (file)
--- a/packages/itk/PackageConfig.cmake.in
+++ b/packages/itk/PackageConfig.cmake.in
@@ -5,6 +5,7 @@ SET(BBTK_PACKAGE_NAME                 @BBTK_PACKAGE_NAME@)
 SET(@BBTK_PACKAGE_NAME@_USE_VTK       @BBTK_PACKAGE_USE_VTK@)
 SET(@BBTK_PACKAGE_NAME@_USE_ITK       @BBTK_PACKAGE_USE_ITK@)
 SET(@BBTK_PACKAGE_NAME@_USE_GDCM      @BBTK_PACKAGE_USE_GDCM@)
+SET(@BBTK_PACKAGE_NAME@_USE_GDCM2     @BBTK_PACKAGE_USE_GDCM2@)
 SET(@BBTK_PACKAGE_NAME@_USE_GSMIS     @BBTK_PACKAGE_USE_GSMIS@)
 SET(@BBTK_PACKAGE_NAME@_USE_WXWIDGETS @BBTK_PACKAGE_USE_WXWIDGETS@)
 SET(@BBTK_PACKAGE_NAME@_USE_PACKAGES  @BBTK_PACKAGE_USE_PACKAGES@)

diff --git a/packages/itkvtk/CMakeLists.txt b/packages/itkvtk/CMakeLists.txt
index 33846ed044ac249b189d86ce8695e23059dd4e66..0b06c61f73157d3ba5c0417e43268344fc605e3a 100644 (file)
--- a/packages/itkvtk/CMakeLists.txt
+++ b/packages/itkvtk/CMakeLists.txt
@@ -35,9 +35,10 @@ SET(${BBTK_PACKAGE_NAME}_BUILD_VERSION 0)
 
 #===========================================================================
 # UNCOMMENT EACH LIBRARY NEEDED (WILL BE FOUND AND USED AUTOMATICALLY)
- SET(${BBTK_PACKAGE_NAME}_USE_VTK  ON)
- SET(${BBTK_PACKAGE_NAME}_USE_ITK  ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_GDCM ON)
+ SET(${BBTK_PACKAGE_NAME}_USE_VTK   ON)
+ SET(${BBTK_PACKAGE_NAME}_USE_ITK   ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM  ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM2 ON)
 # SET(${BBTK_PACKAGE_NAME}_USE_GSMIS ON)
 # SET(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS ON)
 #===========================================================================

diff --git a/packages/itkvtk/PackageConfig.cmake.in b/packages/itkvtk/PackageConfig.cmake.in
index 0ade94bf9aaaf8ad67ed0efa85f67e2990fd149c..5c7a307b456d2d9f708693797c9916552e50e4ff 100644 (file)
--- a/packages/itkvtk/PackageConfig.cmake.in
+++ b/packages/itkvtk/PackageConfig.cmake.in
@@ -5,6 +5,7 @@ SET(BBTK_PACKAGE_NAME                 @BBTK_PACKAGE_NAME@)
 SET(@BBTK_PACKAGE_NAME@_USE_VTK       @BBTK_PACKAGE_USE_VTK@)
 SET(@BBTK_PACKAGE_NAME@_USE_ITK       @BBTK_PACKAGE_USE_ITK@)
 SET(@BBTK_PACKAGE_NAME@_USE_GDCM      @BBTK_PACKAGE_USE_GDCM@)
+SET(@BBTK_PACKAGE_NAME@_USE_GDCM2     @BBTK_PACKAGE_USE_GDCM@)
 SET(@BBTK_PACKAGE_NAME@_USE_GSMIS     @BBTK_PACKAGE_USE_GSMIS@)
 SET(@BBTK_PACKAGE_NAME@_USE_WXWIDGETS @BBTK_PACKAGE_USE_WXWIDGETS@)
 SET(@BBTK_PACKAGE_NAME@_USE_PACKAGES  @BBTK_PACKAGE_USE_PACKAGES@)

diff --git a/packages/kw/CMakeLists.txt b/packages/kw/CMakeLists.txt
index 35ded51b69ea01c8257768771a98b5dd73beaace..d792c46c91d5c394d003ad527df217e495cc775c 100644 (file)
--- a/packages/kw/CMakeLists.txt
+++ b/packages/kw/CMakeLists.txt
@@ -35,9 +35,10 @@ SET(${BBTK_PACKAGE_NAME}_BUILD_VERSION 0)
 
 #===========================================================================
 # UNCOMMENT EACH LIBRARY NEEDED (WILL BE FOUND AND USED AUTOMATICALLY)
-# SET(${BBTK_PACKAGE_NAME}_USE_VTK  ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_ITK  ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_GDCM ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_VTK   ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_ITK   ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM  ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM2 ON)
 # SET(${BBTK_PACKAGE_NAME}_USE_GSMIS ON)
 # SET(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS ON)
 #===========================================================================

diff --git a/packages/kw/PackageConfig.cmake.in b/packages/kw/PackageConfig.cmake.in
index 0ade94bf9aaaf8ad67ed0efa85f67e2990fd149c..c1b0355e3c5fb77a14e4816ef6306aded1f70ef4 100644 (file)
--- a/packages/kw/PackageConfig.cmake.in
+++ b/packages/kw/PackageConfig.cmake.in
@@ -5,6 +5,7 @@ SET(BBTK_PACKAGE_NAME                 @BBTK_PACKAGE_NAME@)
 SET(@BBTK_PACKAGE_NAME@_USE_VTK       @BBTK_PACKAGE_USE_VTK@)
 SET(@BBTK_PACKAGE_NAME@_USE_ITK       @BBTK_PACKAGE_USE_ITK@)
 SET(@BBTK_PACKAGE_NAME@_USE_GDCM      @BBTK_PACKAGE_USE_GDCM@)
+SET(@BBTK_PACKAGE_NAME@_USE_GDCM2     @BBTK_PACKAGE_USE_GDCM2@)
 SET(@BBTK_PACKAGE_NAME@_USE_GSMIS     @BBTK_PACKAGE_USE_GSMIS@)
 SET(@BBTK_PACKAGE_NAME@_USE_WXWIDGETS @BBTK_PACKAGE_USE_WXWIDGETS@)
 SET(@BBTK_PACKAGE_NAME@_USE_PACKAGES  @BBTK_PACKAGE_USE_PACKAGES@)

diff --git a/packages/qt/CMakeLists.txt b/packages/qt/CMakeLists.txt
index 3802e43172ed745d299dd55118e5e5eecd4d4f79..0f2ecbcf18b496c41c55a9ed8487052da157b78b 100644 (file)
--- a/packages/qt/CMakeLists.txt
+++ b/packages/qt/CMakeLists.txt
@@ -37,14 +37,16 @@ SET(${BBTK_PACKAGE_NAME}_BUILD_VERSION 0)
 
 #===========================================================================
 # UNCOMMENT EACH LIBRARY NEEDED (WILL BE FOUND AND USED AUTOMATICALLY)
-# SET(${BBTK_PACKAGE_NAME}_USE_VTK  ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_VTK        ON)
 SET(${BBTK_PACKAGE_NAME}_USE_QT  ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_ITK  ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_GDCM ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_GDCM_VTK ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_GSMIS ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_KWWIDGETS ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_ITK        ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM       ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM2      ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM_VTK   ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM2_VTK  ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GSMIS      ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS  ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_KWWIDGETS  ON)
 #===========================================================================
 
 #===========================================================================

diff --git a/packages/qt/PackageConfig.cmake.in b/packages/qt/PackageConfig.cmake.in
index 0ade94bf9aaaf8ad67ed0efa85f67e2990fd149c..c1b0355e3c5fb77a14e4816ef6306aded1f70ef4 100644 (file)
--- a/packages/qt/PackageConfig.cmake.in
+++ b/packages/qt/PackageConfig.cmake.in
@@ -5,6 +5,7 @@ SET(BBTK_PACKAGE_NAME                 @BBTK_PACKAGE_NAME@)
 SET(@BBTK_PACKAGE_NAME@_USE_VTK       @BBTK_PACKAGE_USE_VTK@)
 SET(@BBTK_PACKAGE_NAME@_USE_ITK       @BBTK_PACKAGE_USE_ITK@)
 SET(@BBTK_PACKAGE_NAME@_USE_GDCM      @BBTK_PACKAGE_USE_GDCM@)
+SET(@BBTK_PACKAGE_NAME@_USE_GDCM2     @BBTK_PACKAGE_USE_GDCM2@)
 SET(@BBTK_PACKAGE_NAME@_USE_GSMIS     @BBTK_PACKAGE_USE_GSMIS@)
 SET(@BBTK_PACKAGE_NAME@_USE_WXWIDGETS @BBTK_PACKAGE_USE_WXWIDGETS@)
 SET(@BBTK_PACKAGE_NAME@_USE_PACKAGES  @BBTK_PACKAGE_USE_PACKAGES@)

diff --git a/packages/std/CMakeLists.txt b/packages/std/CMakeLists.txt
index 453b288a63e7730871fd2532cc0a988b61b28100..6e16f81633ff9510fb559424ab1a2396c75be93e 100644 (file)
--- a/packages/std/CMakeLists.txt
+++ b/packages/std/CMakeLists.txt
@@ -14,9 +14,10 @@ SET(BBTK_PACKAGE_NAME std)
 
 #===========================================================================
 # UNCOMMENT EACH LIBRARY NEEDED
-# SET(${BBTK_PACKAGE_NAME}_USE_VTK  ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_ITK  ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_GDCM ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_VTK   ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_ITK   ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM  ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM2 ON)
 # SET(${BBTK_PACKAGE_NAME}_USE_GSMIS ON)
 # SET(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS ON)
 #===========================================================================

diff --git a/packages/std/PackageConfig.cmake.in b/packages/std/PackageConfig.cmake.in
index 0ade94bf9aaaf8ad67ed0efa85f67e2990fd149c..c1b0355e3c5fb77a14e4816ef6306aded1f70ef4 100644 (file)
--- a/packages/std/PackageConfig.cmake.in
+++ b/packages/std/PackageConfig.cmake.in
@@ -5,6 +5,7 @@ SET(BBTK_PACKAGE_NAME                 @BBTK_PACKAGE_NAME@)
 SET(@BBTK_PACKAGE_NAME@_USE_VTK       @BBTK_PACKAGE_USE_VTK@)
 SET(@BBTK_PACKAGE_NAME@_USE_ITK       @BBTK_PACKAGE_USE_ITK@)
 SET(@BBTK_PACKAGE_NAME@_USE_GDCM      @BBTK_PACKAGE_USE_GDCM@)
+SET(@BBTK_PACKAGE_NAME@_USE_GDCM2     @BBTK_PACKAGE_USE_GDCM2@)
 SET(@BBTK_PACKAGE_NAME@_USE_GSMIS     @BBTK_PACKAGE_USE_GSMIS@)
 SET(@BBTK_PACKAGE_NAME@_USE_WXWIDGETS @BBTK_PACKAGE_USE_WXWIDGETS@)
 SET(@BBTK_PACKAGE_NAME@_USE_PACKAGES  @BBTK_PACKAGE_USE_PACKAGES@)

diff --git a/packages/toolsbbtk/CMakeLists.txt b/packages/toolsbbtk/CMakeLists.txt
index 0e55fa9f9d1d19679ce135c8aa2515aafcfd8b3a..0548d480150173235e9384b492d2e1a35acd150e 100644 (file)
--- a/packages/toolsbbtk/CMakeLists.txt
+++ b/packages/toolsbbtk/CMakeLists.txt
@@ -35,9 +35,10 @@ SET(${BBTK_PACKAGE_NAME}_BUILD_VERSION 0)
 
 #===========================================================================
 # UNCOMMENT EACH LIBRARY NEEDED (WILL BE FOUND AND USED AUTOMATICALLY)
-# SET(${BBTK_PACKAGE_NAME}_USE_VTK  ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_ITK  ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_GDCM ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_VTK   ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_ITK   ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM  ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM2 ON)
 # SET(${BBTK_PACKAGE_NAME}_USE_GSMIS ON)
 # SET(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS ON)
 #===========================================================================

diff --git a/packages/vtk/CMakeLists.txt b/packages/vtk/CMakeLists.txt
index 0525a32c0eff4453385f72a5fb7d05056d8d2858..f4bd9bde100657536196992dcf4ab68ae2378078 100644 (file)
--- a/packages/vtk/CMakeLists.txt
+++ b/packages/vtk/CMakeLists.txt
@@ -36,8 +36,9 @@ SET(${BBTK_PACKAGE_NAME}_BUILD_VERSION 0)
 #===========================================================================
 # UNCOMMENT EACH LIBRARY NEEDED (WILL BE FOUND AND USED AUTOMATICALLY)
  SET(${BBTK_PACKAGE_NAME}_USE_VTK  ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_ITK  ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_GDCM ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_ITK   ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM  ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM2 ON)
 # SET(${BBTK_PACKAGE_NAME}_USE_GSMIS ON)
 # SET(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS ON)
 #===========================================================================

diff --git a/packages/vtk/PackageConfig.cmake.in b/packages/vtk/PackageConfig.cmake.in
index 0ade94bf9aaaf8ad67ed0efa85f67e2990fd149c..bfcc28a8555809a4fc635c7636cfb0529bd98de5 100644 (file)
--- a/packages/vtk/PackageConfig.cmake.in
+++ b/packages/vtk/PackageConfig.cmake.in
@@ -5,11 +5,14 @@ SET(BBTK_PACKAGE_NAME                 @BBTK_PACKAGE_NAME@)
 SET(@BBTK_PACKAGE_NAME@_USE_VTK       @BBTK_PACKAGE_USE_VTK@)
 SET(@BBTK_PACKAGE_NAME@_USE_ITK       @BBTK_PACKAGE_USE_ITK@)
 SET(@BBTK_PACKAGE_NAME@_USE_GDCM      @BBTK_PACKAGE_USE_GDCM@)
+SET(@BBTK_PACKAGE_NAME@_USE_GDCM2     @BBTK_PACKAGE_USE_GDCM2@)
 SET(@BBTK_PACKAGE_NAME@_USE_GSMIS     @BBTK_PACKAGE_USE_GSMIS@)
 SET(@BBTK_PACKAGE_NAME@_USE_WXWIDGETS @BBTK_PACKAGE_USE_WXWIDGETS@)
 SET(@BBTK_PACKAGE_NAME@_USE_PACKAGES  @BBTK_PACKAGE_USE_PACKAGES@)
+
 SET(@BBTK_PACKAGE_NAME@_AUTHOR        "@BBTK_PACKAGE_AUTHOR@") 
 SET(@BBTK_PACKAGE_NAME@_DESCRIPTION   "@BBTK_PACKAGE_DESCRIPTION@")
+
 SET(@BBTK_PACKAGE_NAME@_MAJOR_VERSION @BBTK_PACKAGE_MAJOR_VERSION@)
 SET(@BBTK_PACKAGE_NAME@_MINOR_VERSION @BBTK_PACKAGE_MINOR_VERSION@) 
 SET(@BBTK_PACKAGE_NAME@_BUILD_VERSION @BBTK_PACKAGE_BUILD_VERSION@)

diff --git a/packages/wx/PackageConfig.cmake.in b/packages/wx/PackageConfig.cmake.in
index 0ade94bf9aaaf8ad67ed0efa85f67e2990fd149c..58ea4acae4de88865b505e2a10d973fe4ae9a01f 100644 (file)
--- a/packages/wx/PackageConfig.cmake.in
+++ b/packages/wx/PackageConfig.cmake.in
@@ -5,6 +5,7 @@ SET(BBTK_PACKAGE_NAME                 @BBTK_PACKAGE_NAME@)
 SET(@BBTK_PACKAGE_NAME@_USE_VTK       @BBTK_PACKAGE_USE_VTK@)
 SET(@BBTK_PACKAGE_NAME@_USE_ITK       @BBTK_PACKAGE_USE_ITK@)
 SET(@BBTK_PACKAGE_NAME@_USE_GDCM      @BBTK_PACKAGE_USE_GDCM@)
+SET(@BBTK_PACKAGE_NAME@_USE_GDCM2      @BBTK_PACKAGE_USE_GDCM2@)
 SET(@BBTK_PACKAGE_NAME@_USE_GSMIS     @BBTK_PACKAGE_USE_GSMIS@)
 SET(@BBTK_PACKAGE_NAME@_USE_WXWIDGETS @BBTK_PACKAGE_USE_WXWIDGETS@)
 SET(@BBTK_PACKAGE_NAME@_USE_PACKAGES  @BBTK_PACKAGE_USE_PACKAGES@)

diff --git a/packages/wxvtk/CMakeLists.txt b/packages/wxvtk/CMakeLists.txt
index 720ae18d8ccc320a39b8adfc5535d4370691cc89..2f7e2bdb3fe3623fe6dd771fdb580086e8fe2c79 100644 (file)
--- a/packages/wxvtk/CMakeLists.txt
+++ b/packages/wxvtk/CMakeLists.txt
@@ -36,8 +36,9 @@ SET(${BBTK_PACKAGE_NAME}_BUILD_VERSION 0)
 #===========================================================================
 # UNCOMMENT EACH LIBRARY NEEDED (WILL BE FOUND AND USED AUTOMATICALLY)
  SET(${BBTK_PACKAGE_NAME}_USE_VTK  ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_ITK  ON)
-# SET(${BBTK_PACKAGE_NAME}_USE_GDCM ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_ITK   ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM  ON)
+# SET(${BBTK_PACKAGE_NAME}_USE_GDCM2 ON)
 # SET(${BBTK_PACKAGE_NAME}_USE_GSMIS ON)
  SET(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS ON)
 #===========================================================================

diff --git a/packages/wxvtk/PackageConfig.cmake.in b/packages/wxvtk/PackageConfig.cmake.in
index 0ade94bf9aaaf8ad67ed0efa85f67e2990fd149c..c1b0355e3c5fb77a14e4816ef6306aded1f70ef4 100644 (file)
--- a/packages/wxvtk/PackageConfig.cmake.in
+++ b/packages/wxvtk/PackageConfig.cmake.in
@@ -5,6 +5,7 @@ SET(BBTK_PACKAGE_NAME                 @BBTK_PACKAGE_NAME@)
 SET(@BBTK_PACKAGE_NAME@_USE_VTK       @BBTK_PACKAGE_USE_VTK@)
 SET(@BBTK_PACKAGE_NAME@_USE_ITK       @BBTK_PACKAGE_USE_ITK@)
 SET(@BBTK_PACKAGE_NAME@_USE_GDCM      @BBTK_PACKAGE_USE_GDCM@)
+SET(@BBTK_PACKAGE_NAME@_USE_GDCM2     @BBTK_PACKAGE_USE_GDCM2@)
 SET(@BBTK_PACKAGE_NAME@_USE_GSMIS     @BBTK_PACKAGE_USE_GSMIS@)
 SET(@BBTK_PACKAGE_NAME@_USE_WXWIDGETS @BBTK_PACKAGE_USE_WXWIDGETS@)
 SET(@BBTK_PACKAGE_NAME@_USE_PACKAGES  @BBTK_PACKAGE_USE_PACKAGES@)