X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=aceb0c453ea9b88e7affdc70af814d9e505ddfbf;hb=f12e51a575034ba832a0ff3b9f9c5ba219fc8562;hp=6c145666a05e1b8fda6316272db4661f90c39f12;hpb=267cd2eb2fb4d580bb9c1106f91ea213cb3c033e;p=gdcm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c145666..aceb0c45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,20 +1,10 @@
 PROJECT(GDCM)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.0)
 
-#MESSAGE("MATHIEU: ${CMAKE_VERSION_RELEASE}")
-#MESSAGE("MATHIEU: ${CMAKE_VERSION}")
-#MESSAGE("MATHIEU: ${CMAKE_CACHE_RELEASE_VERSION}")
-#IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} EQUAL 2.0)
-#  IF(${CMAKE_CACHE_RELEASE_VERSION} EQUAL "patch 5")
-#    MESSAGE("MAHTIEU FOO")
-#  ENDIF(${CMAKE_CACHE_RELEASE_VERSION} EQUAL "patch 5")
-#ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} EQUAL 2.0)
-
-
 #-----------------------------------------------------------------------------
 # GDCM version number, usefull for packaging and doxygen doc:
-SET(GDCM_MAJOR_VERSION 0)
-SET(GDCM_MINOR_VERSION 7)
+SET(GDCM_MAJOR_VERSION 1)
+SET(GDCM_MINOR_VERSION 0)
 SET(GDCM_BUILD_VERSION 0)
 SET(GDCM_VERSION 
     "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")
@@ -43,11 +33,11 @@ IF("GDCM_COMPILER_HAS_FUNCTION" MATCHES "^GDCM_COMPILER_HAS_FUNCTION$")
   MESSAGE(STATUS "Checking support for __FUNCTION__ in compiler")
   TRY_COMPILE(GDCM_COMPILER_HAS_FUNCTION
               ${GDCM_BINARY_DIR}/CMakeTmp/Function
-              ${GDCM_SOURCE_DIR}/gdcmTestFUNCTION.cxx
+              ${GDCM_SOURCE_DIR}/CMake/gdcmTestFUNCTION.cxx
               OUTPUT_VARIABLE OUTPUT)
   IF(GDCM_COMPILER_HAS_FUNCTION)
     MESSAGE(STATUS "Checking support for __FUNCTION__ -- yes")
-    SET(GDCM_COMPILER_HAS_FUNCTION 1 CACHE INTERNAL "Support for extention C __FUNCTION__")
+    SET(GDCM_COMPILER_HAS_FUNCTION 1 CACHE INTERNAL "Support for extension C __FUNCTION__")
     WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeOutput.log
       "Determining if the C compiler supports __FUNCTION__ "
       "passed with the following output:\n"
@@ -64,33 +54,33 @@ ENDIF("GDCM_COMPILER_HAS_FUNCTION" MATCHES "^GDCM_COMPILER_HAS_FUNCTION$")
 
 #-----------------------------------------------------------------------------
 # Test if os defines a lenght for sockaddr
-IF("GDCM_OS_HAVE_SA_LEN" MATCHES "^GDCM_OS_HAVE_SA_LEN$")
+IF("HAVE_SA_LEN" MATCHES "^HAVE_SA_LEN$")
   STRING(ASCII 35 POUND)
   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; }")
   MESSAGE(STATUS "Checking if ifreq has a sa_len")
-  TRY_COMPILE(GDCM_OS_HAVE_SA_LEN
+  TRY_COMPILE(HAVE_SA_LEN
               ${GDCM_BINARY_DIR}
               ${GDCM_BINARY_DIR}/CMakeTmp/gdcmTestHAVESALEN.c
               OUTPUT_VARIABLE OUTPUT)
-  IF(GDCM_OS_HAVE_SA_LEN)
+  IF(HAVE_SA_LEN)
     MESSAGE(STATUS "Checking if ifreq has a sa_len -- yes")
-    SET(GDCM_OS_HAVE_SA_LEN 1 CACHE INTERNAL "Support if ifreq has a sa_len")
+    SET(HAVE_SA_LEN 1 CACHE INTERNAL "Support if ifreq has a sa_len")
     WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeOutput.log
       "Determining if ifreq has a sa_len"
       "passed with the following output:\n"
       "${OUTPUT}\n" APPEND)
-  ELSE(GDCM_OS_HAVE_SA_LEN)
+  ELSE(HAVE_SA_LEN)
     MESSAGE(STATUS "Checking if ifreq has a sa_len -- no")
-    SET(GDCM_OS_HAVE_SA_LEN 0 CACHE INTERNAL "Support if ifreq has a sa_len")
+    SET(HAVE_SA_LEN 0 CACHE INTERNAL "Support if ifreq has a sa_len")
     WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log
       "Determining if ifreq has a sa_len"
       "failed with the following output:\n"
       "${OUTPUT}\n" APPEND)
-  ENDIF(GDCM_OS_HAVE_SA_LEN)
-ENDIF("GDCM_OS_HAVE_SA_LEN" MATCHES "^GDCM_OS_HAVE_SA_LEN$")
+  ENDIF(HAVE_SA_LEN)
+ENDIF("HAVE_SA_LEN" MATCHES "^HAVE_SA_LEN$")
 
 #-----------------------------------------------------------------------------
 # Build directory on which many applications depend
@@ -128,6 +118,7 @@ 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)
 
 # Check if header file exists and add it to the list.
 INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFiles.cmake)
@@ -151,6 +142,10 @@ CHECK_INCLUDE_FILE_CONCAT("netinet/in.h"   CMAKE_HAVE_NETINET_IN_H)
 CHECK_INCLUDE_FILE_CONCAT("net/if_dl.h"    CMAKE_HAVE_NET_IF_DL_H)
 CHECK_INCLUDE_FILE_CONCAT("net/if_arp.h"   CMAKE_HAVE_NET_IF_ARP_H)
 
+#-----------------------------------------------------------------------------
+# Force Big Endian emulation on little endian:
+OPTION(GDCM_FORCE_BIGENDIAN_EMULATION "Force Big Endian Emulation. Do use if you don't know what you are doing." OFF)
+
 CONFIGURE_FILE(${GDCM_SOURCE_DIR}/gdcmConfigure.h.in
                ${GDCM_BINARY_DIR}/gdcmConfigure.h @ONLY IMMEDIATE)
 
@@ -164,7 +159,7 @@ IF(BUILD_TESTING)
   ENABLE_TESTING()
   INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
   MARK_AS_ADVANCED(DART_ROOT)
-  SUBDIRS(Test)
+  SUBDIRS(Testing)
 ENDIF(BUILD_TESTING)