* oups, revert my last commit

[gdcm.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ebaa055b006fc2b71af1f71c9856dae4a85ebc7..1493505a95dbaead3f3773760b0a7e0e6f621068 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ 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")
@@ -62,6 +62,36 @@ IF("GDCM_COMPILER_HAS_FUNCTION" MATCHES "^GDCM_COMPILER_HAS_FUNCTION$")
   ENDIF(GDCM_COMPILER_HAS_FUNCTION)
 ENDIF("GDCM_COMPILER_HAS_FUNCTION" MATCHES "^GDCM_COMPILER_HAS_FUNCTION$")
 
+#-----------------------------------------------------------------------------
+# Test if os defines a lenght for sockaddr
+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(HAVE_SA_LEN
+              ${GDCM_BINARY_DIR}
+              ${GDCM_BINARY_DIR}/CMakeTmp/gdcmTestHAVESALEN.c
+              OUTPUT_VARIABLE OUTPUT)
+  IF(HAVE_SA_LEN)
+    MESSAGE(STATUS "Checking if ifreq has a sa_len -- yes")
+    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(HAVE_SA_LEN)
+    MESSAGE(STATUS "Checking if ifreq has a sa_len -- no")
+    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(HAVE_SA_LEN)
+ENDIF("HAVE_SA_LEN" MATCHES "^HAVE_SA_LEN$")
+
 #-----------------------------------------------------------------------------
 # Build directory on which many applications depend
 SUBDIRS(
@@ -98,6 +128,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)
@@ -134,7 +165,7 @@ IF(BUILD_TESTING)
   ENABLE_TESTING()
   INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
   MARK_AS_ADVANCED(DART_ROOT)
-  SUBDIRS(Test)
+  SUBDIRS(Testing)
 ENDIF(BUILD_TESTING)