X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=454ff42933427b98b627411453ab3a5747928c35;hb=b2423cb224675ea9089918bbd53eadf8ed0c5b15;hp=b13580cfd39231945ca902c43b2e2ab9b1f253c5;hpb=880f6dfe2e061712fafbf75ab9547aadf170fc40;p=gdcm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b13580cf..454ff429 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,12 +11,6 @@ SET(GDCM_BUILD_VERSION 1)
 SET(GDCM_VERSION 
     "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")
 
-#-----------------------------------------------------------------------------
-# datadir in CMake:
-SET(GDCM_DATA_DIR "/share/gdcm/" CACHE INTERNAL 
-  "Install location for data (relative to prefix).")
-MARK_AS_ADVANCED(GDCM_DATA_DIR)
-
 #-----------------------------------------------------------------------------
 # Provide compatibility options.
 OPTION(GDCM_LEGACY_REMOVE "Remove all legacy code completely." OFF)
@@ -37,21 +31,22 @@ MARK_AS_ADVANCED(GDCM_DEBUG)
 
 # --------------------------------------------------------------------------
 # Install directories
+STRING(TOLOWER ${PROJECT_NAME} project_name)
 
 IF(NOT GDCM_INSTALL_BIN_DIR)
   SET(GDCM_INSTALL_BIN_DIR "/bin")
 ENDIF(NOT GDCM_INSTALL_BIN_DIR)
 
 IF(NOT GDCM_INSTALL_LIB_DIR)
-  SET(GDCM_INSTALL_LIB_DIR "/lib/${PROJECT_NAME}")
+  SET(GDCM_INSTALL_LIB_DIR "/lib/${project_name}")
 ENDIF(NOT GDCM_INSTALL_LIB_DIR)
 
 IF(NOT GDCM_INSTALL_DATA_DIR)
-  SET(GDCM_INSTALL_DATA_DIR "/share/${PROJECT_NAME}")
+  SET(GDCM_INSTALL_DATA_DIR "/share/${project_name}")
 ENDIF(NOT GDCM_INSTALL_DATA_DIR)
 
 IF(NOT GDCM_INSTALL_INCLUDE_DIR)
-  SET(GDCM_INSTALL_INCLUDE_DIR "/include/${PROJECT_NAME}")
+  SET(GDCM_INSTALL_INCLUDE_DIR "/include/${project_name}")
 ENDIF(NOT GDCM_INSTALL_INCLUDE_DIR)
 
 IF(NOT GDCM_INSTALL_PACKAGE_DIR)
@@ -159,7 +154,6 @@ FIND_PATH(GDCM_DATA_ROOT gdcm-ACR-LibIDO.acr
 )
 
 # Set the place for the public dictionary, must be set before gdcmConfigure.h
-#SET( GDCM_PUB_DICT_PATH "${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}")
 FIND_PATH(GDCM_PUB_DICT_PATH dicomV3.dic
   ${GDCM_SOURCE_DIR}/Dicts
   $ENV{PUB_DICT_PATH}
@@ -247,9 +241,12 @@ ENDIF( ${CMAKE_HAVE_SYS_SOCKET_H} )
 OPTION(GDCM_FORCE_BIGENDIAN_EMULATION "Force Big Endian Emulation. Do 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