X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=c6c273dbf7b9747ad52143e282bd27353d5c08b1;hb=3a9e9df62b3198c4f93d1768074b6be828ac7308;hp=275610a9c9703601ec6f32869b1dff7ccd2540de;hpb=7e30236ba0d7b114bfe941e97f4e55ebed57bb70;p=gdcm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 275610a9..c6c273db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -135,7 +135,11 @@ 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}")
+#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}
+)
 
 #-----------------------------------------------------------------------------
 # SunOS + old gcc fixes:
@@ -228,3 +232,11 @@ IF(GDCM_DOCUMENTATION)
   ENDIF(DOXYGEN)
 ENDIF(GDCM_DOCUMENTATION)
 
+#-----------------------------------------------------------------------------
+IF(WIN32)
+  OPTION(GDCM_INSTALLER "Build the install setup using InnoSetup." OFF)
+  IF(GDCM_INSTALLER)
+    SUBDIRS(Builder)
+  ENDIF(GDCM_INSTALLER)
+ENDIF(WIN32)
+