* Update version

[gdcm.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4546410e822684ec5ef25324df3b02e33fa52c50..ca0b7f1b4fbb1c5538ee5d52e4ef7b1d05041ba6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,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 0)
-SET(GDCM_BUILD_VERSION 0)
+SET(GDCM_BUILD_VERSION 1)
 SET(GDCM_VERSION 
     "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")
 
@@ -33,10 +33,16 @@ MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
 
 EXPORT_LIBRARY_DEPENDENCIES(${GDCM_BINARY_DIR}/GDCMLibraryDepends.cmake)
 
+# Save the compiler settings so another project can import them.
+INCLUDE(${CMAKE_ROOT}/Modules/CMakeExportBuildSettings.cmake)
+CMAKE_EXPORT_BUILD_SETTINGS(${GDCM_BINARY_DIR}/GDCMBuildSettings.cmake)
+#INSTALL_FILES(/lib/gdcm .cmake GDCMBuildSettings)
+
 # For GDCM from build tree:
 SET(GDCM_USE_FILE ${GDCM_SOURCE_DIR}/GDCMUse.cmake)
 SET(GDCM_INCLUDE_DIRS
-  ${GDCM_BINARY_DIR}/src
+  ${GDCM_BINARY_DIR}/     #for gdcmConfigure.h
+  ${GDCM_SOURCE_DIR}/src  #for main gdcm include
   )
 SET(GDCM_LIBRARY_DIRS ${LIBRARY_OUTPUT_PATH})
 SET(GDCM_LIBRARY_DEPENDS_FILE ${GDCM_BINARY_DIR}/GDCMLibraryDepends.cmake)
@@ -129,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:
@@ -222,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)
+