X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=bde81c934f088bd246361c56faf7da1ed0d0e1e1;hb=de5fc413dc579fc61f7e04397efd1dc1087fe3cf;hp=275610a9c9703601ec6f32869b1dff7ccd2540de;hpb=7e30236ba0d7b114bfe941e97f4e55ebed57bb70;p=gdcm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 275610a9..bde81c93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.0)
 # GDCM version number, usefull for packaging and doxygen doc:
 SET(GDCM_MAJOR_VERSION 1)
 SET(GDCM_MINOR_VERSION 0)
-SET(GDCM_BUILD_VERSION 0)
+SET(GDCM_BUILD_VERSION 1)
 SET(GDCM_VERSION 
     "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")
 
@@ -82,36 +82,6 @@ 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(
@@ -135,7 +105,11 @@ FIND_PATH(GDCM_DATA_ROOT gdcm-ACR-LibIDO.acr
 )
 
 # Set the place for the public dictionary, must be set before gdcmConfigure.h
-SET( GDCM_PUB_DICT_PATH "${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}")
+#SET( GDCM_PUB_DICT_PATH "${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}")
+FIND_PATH(GDCM_PUB_DICT_PATH dicomV3.dic
+  ${GDCM_SOURCE_DIR}/Dicts
+  $ENV{PUB_DICT_PATH}
+)
 
 #-----------------------------------------------------------------------------
 # SunOS + old gcc fixes:
@@ -164,13 +138,48 @@ 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)
-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)
-CHECK_INCLUDE_FILE_CONCAT("net/if.h"       CMAKE_HAVE_NET_IF_H)
-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)
+IF(UNIX) #Avoid pollutting 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)
+  CHECK_INCLUDE_FILE_CONCAT("net/if.h"       CMAKE_HAVE_NET_IF_H)
+  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)
+ENDIF(UNIX)
+
+#-----------------------------------------------------------------------------
+# Test if os defines a lenght 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$")
+    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$")
+ENDIF( ${CMAKE_HAVE_SYS_SOCKET_H} )
 
 #-----------------------------------------------------------------------------
 # Force Big Endian emulation on little endian:
@@ -228,3 +237,11 @@ IF(GDCM_DOCUMENTATION)
   ENDIF(DOXYGEN)
 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)
+