From ee38a24e454e9675ee479469a844f8a850bc1afa Mon Sep 17 00:00:00 2001 From: malaterre Date: Mon, 24 Oct 2005 01:16:19 +0000 Subject: [PATCH] COMP: Try to fix JPR last commit to compile...hopefully --- CMakeLists.txt | 2 ++ Testing/TestInline.cxx | 6 ++++-- gdcmConfigure.h.in | 6 ++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 382fb8d1..316955d5 100644 --- 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 a8170c8c..60bbc618 100755 --- 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 #include +#ifdef CMAKE_HAVE_SYS_TIMES_H #include +#endif void frswap (double &a, double &b); void fpswap (double *a, double *b); diff --git a/gdcmConfigure.h.in b/gdcmConfigure.h.in index 19d7b9f6..3283168c 100644 --- 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 -- 2.45.1