X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=d988ba74e39e46cd9fc751e956e4422e4755ce93;hb=2d217e8646ae1df5d733a87fa0daa3fb6c07bf5f;hp=ba9f86f449b3d9ea1f8ac1be5112bc68603611fa;hpb=f540ed5835e7b89478e6048a577d494c0e156f2a;p=gdcm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba9f86f4..d988ba74 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)
 
 
@@ -238,12 +241,15 @@ 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)
+               ${GDCM_BINARY_DIR}/gdcmConfigure.h @ONLY IMMEDIATE
+               )
 
-INSTALL_FILES(/include/gdcm .h gdcmConfigure.h)
+IF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
+  INSTALL_FILES(${GDCM_INSTALL_INCLUDE_DIR} FILES gdcmConfigure.h)
+ENDIF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
 
 #-----------------------------------------------------------------------------
 # Add the testing directories