Minor cleanup for toplevel CMakeLists

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