From: malaterre <malaterre>
Date: Mon, 3 May 2004 03:59:43 +0000 (+0000)
Subject: Minor cleanup for toplevel CMakeLists
X-Git-Tag: Version0.5.bp~201
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=899b1fe44da54cbc2bde2be2a4dec5ec7606cf97;p=gdcm.git

Minor cleanup for toplevel CMakeLists
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd260e91..38495bcf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,23 +18,19 @@ MARK_AS_ADVANCED(GDCM_DATA_DIR)
 #-----------------------------------------------------------------------------
 # Build shared lib by default
 OPTION(BUILD_SHARED_LIBS "Build GDCM with shared libraries." ON)
-SET(GDCM_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 
 OPTION(GDCM_DEBUG "Turn verbosity of some statement ON." OFF)
 
 #-----------------------------------------------------------------------------
 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.")
-#MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
-#SET(GDCM_LIBRARY_PATH "${LIBRARY_OUTPUT_PATH}")
-#SET(GDCM_EXECUTABLE_PATH "${EXECUTABLE_OUTPUT_PATH}")
+MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
 
 #-----------------------------------------------------------------------------
 # Build directory on which many applications depend
 SUBDIRS(
   src
   Dicts
-  Test
   Example
 )
 
@@ -46,10 +42,10 @@ FIND_PATH(GDCM_DATA_ROOT gdcm-ACR-LibIDO.acr
   $ENV{PUB_DICT_PATH}/../../gdcmData
 )
 
-#-----------------------------------------------------------------------------
-# Set the place for the public dictionary
+# Set the place for the public dictionary, must be set before gdcmConfigure.h
 SET( GDCM_PUB_DICT_PATH "${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}")
 
+#-----------------------------------------------------------------------------
 # SunOS + old gcc fixes:
 INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake)
 IF(CMAKE_NO_ANSI_STRING_STREAM)
@@ -59,10 +55,6 @@ ENDIF(CMAKE_NO_ANSI_STRING_STREAM)
 INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
 CHECK_INCLUDE_FILE("stdint.h" CMAKE_HAVE_STDINT_H)
 
-IF(NOT CMAKE_HAVE_STDINT_H)
-  SET(GDCM_HAVE_NO_STDINT_H 1)
-ENDIF(NOT CMAKE_HAVE_STDINT_H)
-
 CONFIGURE_FILE(${GDCM_SOURCE_DIR}/gdcmConfigure.h.in
                ${GDCM_BINARY_DIR}/gdcmConfigure.h @ONLY IMMEDIATE)
 
@@ -70,12 +62,11 @@ INSTALL_FILES(/include .h gdcmConfigure.h)
 
 #-----------------------------------------------------------------------------
 # Add the testing directories
-OPTION(GDCM_BUILD_TESTING "Test the project" ON)
-IF(GDCM_BUILD_TESTING)
+IF(BUILD_TESTING)
   ENABLE_TESTING()
   INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
   SUBDIRS(Test)
-ENDIF(GDCM_BUILD_TESTING)
+ENDIF(BUILD_TESTING)
 
 
 #-----------------------------------------------------------------------------