X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=a3ab0d5c34551ead0c67316de9d4a402a748fcb0;hb=4518d271e0841e857f49a1827b8897ee5f38ce3c;hp=7a97d540ee08d90af34e0a83d1fe0714a2f00162;hpb=04174b3197ed2166f15e18c45dc632a5baa1caae;p=gdcm.git

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