COMP: Try to fix JPR last commit to compile...hopefully

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 382fb8d12117196c56c3daac87bf46a026d5f327..316955d5894d2e7ec977dd96a769577ae18e1a7b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,6 +132,8 @@ CHECK_INCLUDE_FILE("stdint.h"       CMAKE_HAVE_STDINT_H)
 IF(UNIX) #Avoid polluting Win32 cmakecache
   CHECK_INCLUDE_FILE("inttypes.h"     CMAKE_HAVE_INTTYPES_H)
 ENDIF(UNIX)
+# Special JPR, don't know what he is doing...
+CHECK_INCLUDE_FILE("sys/times.h"     CMAKE_HAVE_SYS_TIMES_H)
 
 # Check if header file exists and add it to the list.
 INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFiles.cmake)

diff --git a/Testing/TestInline.cxx b/Testing/TestInline.cxx
index a8170c8c69c3f3feed6d3270fd6ead71368a84fb..60bbc61864840e2581e3ef0d6bf9828cf72f3f70 100755 (executable)
--- a/Testing/TestInline.cxx
+++ b/Testing/TestInline.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestInline.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/23 14:49:51 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2005/10/24 01:16:20 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -34,7 +34,9 @@
 #include <iostream>
 
 #include <time.h>
+#ifdef CMAKE_HAVE_SYS_TIMES_H
 #include <sys/times.h>
+#endif
 
 void        frswap (double &a, double &b);
 void        fpswap (double *a, double *b);

diff --git a/gdcmConfigure.h.in b/gdcmConfigure.h.in
index 19d7b9f66f2db79a0aab6de1bc7a1515e0ad225f..3283168ca78f103fe4078276e7e3603ba75309b6 100644 (file)
--- a/gdcmConfigure.h.in
+++ b/gdcmConfigure.h.in
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmConfigure.h.in,v $
   Language:  C++
-  Date:      $Date: 2005/10/23 19:46:18 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2005/10/24 01:16:19 $
+  Version:   $Revision: 1.20 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -63,6 +63,8 @@
 
 #define GDCM_SIZEOF_LONG @GDCM_SIZEOF_LONG@
 
+/* Special JPR */
+#cmakedefine CMAKE_HAVE_SYS_TIMES_H
 
 /* GetMacAddress require a lot of include file to access low level API */
 #cmakedefine CMAKE_HAVE_UNISTD_H