X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=ec8a27d7256f13978d8391f3d46e385434fe1bc6;hb=59b4f38954b2fba0dbf5ecfd816ea3b3fcead535;hp=bde81c934f088bd246361c56faf7da1ed0d0e1e1;hpb=c68e4cf4e6ffeff9ce40adf544c237aa3a612f1e;p=gdcm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bde81c93..ec8a27d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,12 @@
 PROJECT(GDCM)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.0)
+# okay in fact you need at least cmake 2.0.4 to get swig working properly
 
 #-----------------------------------------------------------------------------
 # GDCM version number, usefull for packaging and doxygen doc:
 SET(GDCM_MAJOR_VERSION 1)
-SET(GDCM_MINOR_VERSION 0)
-SET(GDCM_BUILD_VERSION 1)
+SET(GDCM_MINOR_VERSION 1)
+SET(GDCM_BUILD_VERSION 0)
 SET(GDCM_VERSION 
     "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")
 
@@ -117,12 +118,16 @@ INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake)
 IF(CMAKE_NO_ANSI_STRING_STREAM)
   SET(GDCM_NO_ANSI_STRING_STREAM 1)
 ENDIF(CMAKE_NO_ANSI_STRING_STREAM)
+
+# Big endian thing:
 INCLUDE (${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
 TEST_BIG_ENDIAN(GDCM_WORDS_BIGENDIAN)
 
 INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
 CHECK_INCLUDE_FILE("stdint.h"       CMAKE_HAVE_STDINT_H)
-CHECK_INCLUDE_FILE("inttypes.h"     CMAKE_HAVE_INTTYPES_H)
+IF(UNIX) #Avoid polluting Win32 cmakecache
+  CHECK_INCLUDE_FILE("inttypes.h"     CMAKE_HAVE_INTTYPES_H)
+ENDIF(UNIX)
 
 # Check if header file exists and add it to the list.
 INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFiles.cmake)
@@ -138,7 +143,7 @@ ENDMACRO(CHECK_INCLUDE_FILE_CONCAT)
 # test the inclusion of files
 CHECK_INCLUDE_FILE_CONCAT("unistd.h"       CMAKE_HAVE_UNISTD_H)
 CHECK_INCLUDE_FILE_CONCAT("stdlib.h"       CMAKE_HAVE_STDLIB_H)
-IF(UNIX) #Avoid pollutting Win32 cmakecache
+IF(UNIX) #Avoid polluting Win32 cmakecache
   CHECK_INCLUDE_FILE_CONCAT("sys/ioctl.h"    CMAKE_HAVE_SYS_IOCTL_H)
   CHECK_INCLUDE_FILE_CONCAT("sys/socket.h"   CMAKE_HAVE_SYS_SOCKET_H)
   CHECK_INCLUDE_FILE_CONCAT("sys/sockio.h"   CMAKE_HAVE_SYS_SOCKIO_H)
@@ -195,6 +200,8 @@ INSTALL_FILES(/include .h gdcmConfigure.h)
 OPTION(BUILD_TESTING "Build testing." ON)
 
 IF(BUILD_TESTING)
+  CONFIGURE_FILE(${GDCM_SOURCE_DIR}/CMake/CTestCustom.ctest.in
+      ${GDCM_BINARY_DIR}/CMake/CTestCustom.ctest @ONLY)
   ENABLE_TESTING()
   INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
   MARK_AS_ADVANCED(DART_ROOT)
@@ -240,8 +247,11 @@ 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)
+IF(UNIX)
+  OPTION(GDCM_INSTALLER "Prepare the rpmBuild use." OFF)
+ENDIF(UNIX)
+IF(GDCM_INSTALLER)
+  SUBDIRS(Builder)
+ENDIF(GDCM_INSTALLER)