X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=462a37f5bae2625a9bed31f0b633f7b8e2f5545e;hb=15cdc6738aa1efbcb1444b6cae04f24d2de977df;hp=f87b10431ad4afa9110215de42160747bccae8be;hpb=7d0479304b904f27272d0464952c54d2bf4a3809;p=gdcm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f87b1043..462a37f5 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
+# and you cannot use cmake 2.0.6 out of the box due to a bug (patched in debian package)
 
 #-----------------------------------------------------------------------------
 # GDCM version number, usefull for packaging and doxygen doc:
 SET(GDCM_MAJOR_VERSION 1)
-SET(GDCM_MINOR_VERSION 2)
+SET(GDCM_MINOR_VERSION 3)
 SET(GDCM_BUILD_VERSION 0)
 SET(GDCM_VERSION 
     "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")
@@ -96,14 +97,14 @@ IF("GDCM_TEST_ISTRINGSTREAM" MATCHES "^GDCM_TEST_ISTRINGSTREAM$")
           ${GDCM_SOURCE_DIR}/CMake/gdcmTestIstringStream.cxx)
   IF(GDCM_TEST_ISTRINGSTREAM_COMPILED)
     IF(GDCM_TEST_ISTRINGSTREAM)
-      MESSAGE(STATUS "Checking signedness of char -- signed")
-      SET(GDCM_TEST_ISTRINGSTREAM 1 CACHE INTERNAL "Whether char is signed.")
+      MESSAGE(STATUS "Checking istringstream works -- yes")
+      SET(GDCM_TEST_ISTRINGSTREAM 1 CACHE INTERNAL "Whether istringstream works.")
     ELSE(GDCM_TEST_ISTRINGSTREAM)
-      MESSAGE(STATUS "Checking signedness of char -- unsigned")
-      SET(GDCM_TEST_ISTRINGSTREAM 0 CACHE INTERNAL "Whether char is signed.")
+      MESSAGE(STATUS "Checking istringstream works -- no")
+      SET(GDCM_TEST_ISTRINGSTREAM 0 CACHE INTERNAL "Whether istringstream works.")
     ENDIF(GDCM_TEST_ISTRINGSTREAM)
   ELSE(GDCM_TEST_ISTRINGSTREAM_COMPILED)
-    MESSAGE(STATUS "Checking signedness of char -- failed")
+    MESSAGE(STATUS "Checking istringstream -- failed")
   ENDIF(GDCM_TEST_ISTRINGSTREAM_COMPILED)
 ENDIF("GDCM_TEST_ISTRINGSTREAM" MATCHES "^GDCM_TEST_ISTRINGSTREAM$")
 
@@ -181,7 +182,7 @@ IF(UNIX) #Avoid polluting Win32 cmakecache
 ENDIF(UNIX)
 
 #-----------------------------------------------------------------------------
-# Test if os defines a lenght for sockaddr
+# Test if os defines a length for sockaddr
 # only doing the test when we have sys/socket
 IF( ${CMAKE_HAVE_SYS_SOCKET_H} )
   IF("HAVE_SA_LEN" MATCHES "^HAVE_SA_LEN$")
@@ -189,7 +190,7 @@ IF( ${CMAKE_HAVE_SYS_SOCKET_H} )
     FILE(WRITE ${GDCM_BINARY_DIR}/CMakeTmp/gdcmTestHAVESALEN.c
       "${POUND}include <sys/types.h>\n"
       "${POUND}include <sys/socket.h>\n"
-      "int main() { struct sockaddr sa; sa.sa_len = 0; }")
+      "int main() { struct sockaddr sa; sa.sa_len = 0; }\n")
     MESSAGE(STATUS "Checking if ifreq has a sa_len")
     TRY_COMPILE(HAVE_SA_LEN
       ${GDCM_BINARY_DIR}