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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 823940a2..3d6c22be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,8 @@ 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_VERSION 
+SET(GDCM_BUILD_VERSION 2)
+SET(GDCM_VERSION
     "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")
 
 #-----------------------------------------------------------------------------
@@ -17,6 +17,12 @@ OPTION(GDCM_LEGACY_REMOVE "Remove all legacy code completely." OFF)
 OPTION(GDCM_LEGACY_SILENT "Silence all legacy code messages." OFF)
 MARK_AS_ADVANCED(GDCM_LEGACY_REMOVE GDCM_LEGACY_SILENT)
 
+# VS 2005 declared that some C functions were deprecated...
+IF(CMAKE_COMPILER_2005)
+  ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
+  ADD_DEFINITIONS(-D_SCL_SECURE_NO_DEPRECATE)
+ENDIF(CMAKE_COMPILER_2005) 
+
 #-----------------------------------------------------------------------------
 # Build shared lib by default
 OPTION(BUILD_SHARED_LIBS "Build GDCM with shared libraries." ON)
@@ -155,6 +161,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
@@ -258,9 +268,10 @@ 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)
+  FILE(WRITE ${GDCM_BINARY_DIR}/CTestCustom.cmake
+    "INCLUDE(\"${GDCM_BINARY_DIR}/CMake/CTestCustom.ctest\")\n")
   ENABLE_TESTING()
-  INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
-  MARK_AS_ADVANCED(DART_ROOT)
+  INCLUDE(CTest)
   SUBDIRS(Testing)
 ENDIF(BUILD_TESTING)