From ed9d32f344e2ffa223081390b63f064cf1e42de0 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Mon, 15 Nov 2010 10:59:02 +0000 Subject: [PATCH] Preapre use of GDCM2 --- CMakeLists.txt | 8 ++++++++ kernel/cmake/BBTKConfigurePackage.cmake | 10 ++++++++++ .../BBTKConfigurePackage_PackageConfig.cmake | 6 +++++- kernel/cmake/BBTKConfigurePackage_src.cmake | 11 ++++++----- packages/appli/CMakeLists.txt | 12 +++++++----- packages/appli/PackageConfig.cmake.in | 1 + packages/demo/PackageConfig.cmake.in | 1 + packages/gdcmvtk/CMakeLists.txt | 9 +++++++++ packages/gdcmvtk/PackageConfig.cmake.in | 1 + packages/itk/CMakeLists.txt | 5 +++-- packages/itk/PackageConfig.cmake.in | 1 + packages/itkvtk/CMakeLists.txt | 7 ++++--- packages/itkvtk/PackageConfig.cmake.in | 1 + packages/kw/CMakeLists.txt | 7 ++++--- packages/kw/PackageConfig.cmake.in | 1 + packages/qt/CMakeLists.txt | 16 +++++++++------- packages/qt/PackageConfig.cmake.in | 1 + packages/std/CMakeLists.txt | 7 ++++--- packages/std/PackageConfig.cmake.in | 1 + packages/toolsbbtk/CMakeLists.txt | 7 ++++--- packages/vtk/CMakeLists.txt | 5 +++-- packages/vtk/PackageConfig.cmake.in | 3 +++ packages/wx/PackageConfig.cmake.in | 1 + packages/wxvtk/CMakeLists.txt | 5 +++-- packages/wxvtk/PackageConfig.cmake.in | 1 + 25 files changed, 92 insertions(+), 36 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c928b8..53fce69 100644 --- 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 f92766f..f72ccd4 100644 --- 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 ccf3cb9..429cbf0 100644 --- 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 52f062f..83ccbf8 100644 --- 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 5b41a14..915fbc0 100644 --- 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 0ade94b..c1b0355 100644 --- 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 0ade94b..c1b0355 100644 --- 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 b6fc7ea..d1fd44d 100644 --- 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 0ade94b..c1b0355 100644 --- 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 72aff18..6a123ed 100644 --- 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 0ade94b..c1b0355 100644 --- 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 33846ed..0b06c61 100644 --- 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 0ade94b..5c7a307 100644 --- 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 35ded51..d792c46 100644 --- 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 0ade94b..c1b0355 100644 --- 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 3802e43..0f2ecbc 100644 --- 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 0ade94b..c1b0355 100644 --- 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 453b288..6e16f81 100644 --- 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 0ade94b..c1b0355 100644 --- 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 0e55fa9..0548d48 100644 --- 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 0525a32..f4bd9bd 100644 --- 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 0ade94b..bfcc28a 100644 --- 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 0ade94b..58ea4ac 100644 --- 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 720ae18..2f7e2bd 100644 --- 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 0ade94b..c1b0355 100644 --- 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@) -- 2.45.0