X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=6224b8057913a4a34ff798f7c67859e9d1251f57;hb=721d134c6e594b9a23bf1ce002ed87bfbc1576a7;hp=454ff42933427b98b627411453ab3a5747928c35;hpb=9a041c5d3469181861a9b9ddd1180b553a67f693;p=gdcm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 454ff429..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}")
 
@@ -29,6 +29,9 @@ SET(GDCM_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES})
 OPTION(GDCM_DEBUG "Turn verbosity of some statement ON." OFF)
 MARK_AS_ADVANCED(GDCM_DEBUG)
 
+# --------------------------------------------------------------------------
+SET (GDCM_NAME_SPACE gdcm    CACHE STRING "name space")
+
 # --------------------------------------------------------------------------
 # Install directories
 STRING(TOLOWER ${PROJECT_NAME} project_name)
@@ -82,7 +85,7 @@ ENDIF(GDCM_BUILD_SHARED_LIBS)
 
 #-----------------------------------------------------------------------------
 SET (EXECUTABLE_OUTPUT_PATH ${GDCM_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
-SET (LIBRARY_OUTPUT_PATH ${GDCM_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
+SET (LIBRARY_OUTPUT_PATH ${GDCM_BINARY_DIR}/bin    CACHE PATH "Single output directory for building all libraries.")
 MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
 
 
@@ -152,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
@@ -238,7 +245,7 @@ ENDIF( ${CMAKE_HAVE_SYS_SOCKET_H} )
 
 #-----------------------------------------------------------------------------
 # Force Big Endian emulation on little endian:
-OPTION(GDCM_FORCE_BIGENDIAN_EMULATION "Force Big Endian Emulation. Do use if you don't know what you are doing." OFF)
+OPTION(GDCM_FORCE_BIGENDIAN_EMULATION "Force Big Endian Emulation. Don't use if you don't know what you are doing." OFF)
 
 CONFIGURE_FILE(${GDCM_SOURCE_DIR}/gdcmConfigure.h.in
                ${GDCM_BINARY_DIR}/gdcmConfigure.h @ONLY IMMEDIATE
@@ -254,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)