ENH: 1. Now the test suite is working for real

[gdcm.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c253b70140298854fca6c2918621359f17298de4..a3ab0d5c34551ead0c67316de9d4a402a748fcb0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,15 +31,15 @@ SET(GDCM_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 #-----------------------------------------------------------------------------\r
 # Output directories.\r
 #Put all stuff in one single dir for Win32, otherwise dll are a pain:\r
-IF(WIN32 AND GDCM_BUILD_SHARED_LIBS)\r
-  SET(OUTPUT_LIB_DIR ${GDCM_SOURCE_DIR}/bin)\r
-ELSE(WIN32 AND GDCM_BUILD_SHARED_LIBS)\r
-  SET(OUTPUT_LIB_DIR ${GDCM_SOURCE_DIR}/lib)\r
-ENDIF(WIN32 AND GDCM_BUILD_SHARED_LIBS)\r
-\r
-SET (EXECUTABLE_OUTPUT_PATH ${GDCM_SOURCE_DIR}/bin CACHE PATH "Single output directory for building all executables.")\r
-SET (LIBRARY_OUTPUT_PATH ${OUTPUT_LIB_DIR} CACHE PATH "Single output directory for building all libraries.")\r
-MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)\r
+#IF(WIN32 AND GDCM_BUILD_SHARED_LIBS)\r
+#  SET(OUTPUT_LIB_DIR ${GDCM_SOURCE_DIR}/bin)\r
+#ELSE(WIN32 AND GDCM_BUILD_SHARED_LIBS)\r
+#  SET(OUTPUT_LIB_DIR ${GDCM_SOURCE_DIR}/lib)\r
+#ENDIF(WIN32 AND GDCM_BUILD_SHARED_LIBS)\r
+\r
+#SET (EXECUTABLE_OUTPUT_PATH ${GDCM_SOURCE_DIR}/bin CACHE PATH "Single output directory for building all executables.")\r
+#SET (LIBRARY_OUTPUT_PATH ${OUTPUT_LIB_DIR} 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
 \r
@@ -54,9 +54,9 @@ SUBDIRS(
 #-----------------------------------------------------------------------------\r
 # Adding GDCM_DATA_ROOT\r
 FIND_PATH(GDCM_DATA_ROOT gdcm-ACR-LibIDO.acr\r
-       ${GDCM_SOURCE_DIR}/../gdcmData \r
-       $ENV{GDCM_DATA}\r
-       $ENV{PUB_DICT_PATH}/../../gdcmData\r
+  ${GDCM_SOURCE_DIR}/../gdcmData \r
+  $ENV{GDCM_DATA}\r
+  $ENV{PUB_DICT_PATH}/../../gdcmData\r
 )\r
 \r
 #-----------------------------------------------------------------------------\r
@@ -89,12 +89,11 @@ IF(NOT CMAKE_HAVE_STDINT_H)
   SET(GDCM_HAVE_NO_STDINT_H 1)\r
 ENDIF(NOT CMAKE_HAVE_STDINT_H)\r
 \r
-#SET(GDCM_NO_ANSI_STRING_STREAM\r
-#  ${CMAKE_NO_ANSI_STRING_STREAM}\r
-#)\r
 CONFIGURE_FILE(${GDCM_SOURCE_DIR}/gdcmConfigure.h.in\r
                ${GDCM_BINARY_DIR}/gdcmConfigure.h @ONLY IMMEDIATE)\r
 \r
+INSTALL_FILES(/include .h gdcmConfigure.h)\r
+\r
 #-----------------------------------------------------------------------------\r
 # Add the testing directories\r
 OPTION(GDCM_BUILD_TESTING "Test the project" ON)\r
@@ -150,7 +149,7 @@ CONFIGURE_FILE(
   ${GDCM_BINARY_DIR}/gdcmConfig.cmake @ONLY IMMEDIATE\r
   )\r
 \r
-# Export uor build settings and library\r
+# Export our build settings and library\r
 # dependencies for the use by the user projects.\r
 INCLUDE(\r
   ${CMAKE_ROOT}/Modules/CMakeExportBuildSettings.cmake)\r
@@ -171,22 +170,3 @@ INSTALL_FILES(/lin/gdcm FILES
   ${GDCM_BINARY_DIR}/gdcmLibraryDepends.cmake\r
   )\r
 \r
-#-----------------------------------------------------------------------------\r
-# Copy / paste from old m4 script:\r
-\r
-# EXTRA_DIST = \\r
-#      AUTHORS \\r
-#      ChangeLog \\r
-#      COPYING \\r
-#      INSTALL \\r
-#      NEWS \\r
-#      README \\r
-#      TODO \\r
-#      gdcm.spec \\r
-#       gdcm.dsw\r
-\r
-#release:\r
-#      $(MAKE) dist distdir=$(PACKAGE)-$(VERSION)\r
-\r
-#snapshot:\r
-#      $(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`\r