X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=3d6c22befb12d439a1329d67c0393b2b13574983;hb=5071bc6d73c22304b8b139d040a02eb3e1f33407;hp=6224b8057913a4a34ff798f7c67859e9d1251f57;hpb=727cd4b6811126fe8877488e5fe8164f66c45ddf;p=gdcm.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 6224b805..3d6c22be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.0) SET(GDCM_MAJOR_VERSION 1) SET(GDCM_MINOR_VERSION 3) SET(GDCM_BUILD_VERSION 2) -SET(GDCM_VERSION +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) @@ -261,10 +267,11 @@ OPTION(BUILD_TESTING "Build testing." ON) IF(BUILD_TESTING) CONFIGURE_FILE(${GDCM_SOURCE_DIR}/CMake/CTestCustom.ctest.in - ${GDCM_BINARY_DIR}/CTestCustom.ctest @ONLY) + ${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)