X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=6224b8057913a4a34ff798f7c67859e9d1251f57;hb=9c76b9a60c1e859bfcd43f4089304827c8361be5;hp=823940a29d42ab2a5f72d68ada7204e692d0c558;hpb=8fd45dc6d321d1419854dc0e4fa6a37d6826b655;p=gdcm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 823940a2..6224b805 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.0)
 # GDCM version number, usefull for packaging and doxygen doc:
 SET(GDCM_MAJOR_VERSION 1)
 SET(GDCM_MINOR_VERSION 3)
-SET(GDCM_BUILD_VERSION 1)
+SET(GDCM_BUILD_VERSION 2)
 SET(GDCM_VERSION 
     "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")
 
@@ -155,6 +155,10 @@ FIND_PATH(GDCM_DATA_ROOT gdcm-ACR-LibIDO.acr
   $ENV{GDCM_DATA}
   $ENV{PUB_DICT_PATH}/../../gdcmData
 )
+# Adding GDCM_DATA_ROOT
+FIND_PATH(GDCM_DATA_EXTRA_ROOT gdcmData.tar.gz
+  ${GDCM_SOURCE_DIR}/../gdcmDataExtra
+)
 
 # Set the place for the public dictionary, must be set before gdcmConfigure.h
 FIND_PATH(GDCM_PUB_DICT_PATH dicomV3.dic
@@ -257,7 +261,7 @@ OPTION(BUILD_TESTING "Build testing." ON)
 
 IF(BUILD_TESTING)
   CONFIGURE_FILE(${GDCM_SOURCE_DIR}/CMake/CTestCustom.ctest.in
-      ${GDCM_BINARY_DIR}/CMake/CTestCustom.ctest @ONLY)
+      ${GDCM_BINARY_DIR}/CTestCustom.ctest @ONLY)
   ENABLE_TESTING()
   INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
   MARK_AS_ADVANCED(DART_ROOT)