ENH: Fix DATA_DIR install path

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b13580cfd39231945ca902c43b2e2ab9b1f253c5..b677f74b669fbddab11220e03f544dff40ed7cf4 100644 (file)
--- 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)
@@ -159,7 +153,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}

diff --git a/Dicts/CMakeLists.txt b/Dicts/CMakeLists.txt
index e0f1797e44eb8bb921f73e46d7031a54071fdf26..576e7ebfa3192d4109c4cd88e66a4e475be97e85 100644 (file)
--- a/Dicts/CMakeLists.txt
+++ b/Dicts/CMakeLists.txt
@@ -110,7 +110,7 @@ CONFIGURE_FILE("${GDCM_SOURCE_DIR}/src/gdcmDefaultDicts.cxx.in"
   "${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx" IMMEDIATE)
 
 #-----------------------------------------------------------------------------
-INSTALL_FILES(${GDCM_DATA_DIR} .dic
+INSTALL_FILES(${GDCM_INSTALL_DATA_DIR} .dic
   dicomV3
   dicomVR
   dicomTS

diff --git a/Doc/CMakeLists.txt b/Doc/CMakeLists.txt
index bb60c4ee3e9d45a164fd71e97ea46e749334c04d..eed65ebd998f5737f500ca34a0ab962fdeb83ff3 100644 (file)
--- a/Doc/CMakeLists.txt
+++ b/Doc/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Build the documentation
 
 SET(HTML_DIR
-  ${GDCM_DATA_DIR}/html
+  ${GDCM_INSTALL_DATA_DIR}/html
 )
 
 SET(TARGET_DIR