COMP: Some more fun with sys/types.h declaring a few u* types but not the other...

[gdcm.git] / src / gdcmjasper / src / libjasper / include / jasper / CMakeLists.txt

diff --git a/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt b/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
index 7a79978a39d4ae778cd182eb4bdd71637e58c974..54324011325e2c3150281c4c34fe7a83213526fe 100644 (file)
--- a/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
@@ -25,24 +25,24 @@
 
 SET(JAS_VERSION "1.701.0")
 
-CHECK_INCLUDE_FILE("dlfcn.h"       HAVE_DLFCN_H)
-CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H)
+CHECK_INCLUDE_FILE("dlfcn.h"    HAVE_DLFCN_H)
+CHECK_INCLUDE_FILE("fcntl.h"    HAVE_FCNTL_H)
 CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H)
-CHECK_INCLUDE_FILE("io.h" HAVE_IO_H)
+CHECK_INCLUDE_FILE("io.h"       HAVE_IO_H)
 #/* Define to 1 if you have the `m' library (-lm). */
 ##define HAVE_LIBM 1
 
-CHECK_INCLUDE_FILE("limits.h" HAVE_LIMITS_H)
-CHECK_INCLUDE_FILE("memory.h" HAVE_MEMORY_H)
-CHECK_INCLUDE_FILE("stdbool.h" HAVE_STDBOOL_H)
-CHECK_INCLUDE_FILE("stddef.h" HAVE_STDDEF_H)
-CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H)
-CHECK_INCLUDE_FILE("stdlib.h" HAVE_STDLIB_H)
-CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H)
-CHECK_INCLUDE_FILE("string.h" HAVE_STRING_H)
-CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H)
+CHECK_INCLUDE_FILE("limits.h"    HAVE_LIMITS_H)
+CHECK_INCLUDE_FILE("memory.h"    HAVE_MEMORY_H)
+CHECK_INCLUDE_FILE("stdbool.h"   HAVE_STDBOOL_H)
+CHECK_INCLUDE_FILE("stddef.h"    HAVE_STDDEF_H)
+CHECK_INCLUDE_FILE("stdint.h"    HAVE_STDINT_H)
+CHECK_INCLUDE_FILE("stdlib.h"    HAVE_STDLIB_H)
+CHECK_INCLUDE_FILE("strings.h"   HAVE_STRINGS_H)
+CHECK_INCLUDE_FILE("string.h"    HAVE_STRING_H)
+CHECK_INCLUDE_FILE("sys/stat.h"  HAVE_SYS_STAT_H)
 CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H)
-CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H)
+CHECK_INCLUDE_FILE("unistd.h"    HAVE_UNISTD_H)
 
 #/* Have variable length arrays */
 ##define HAVE_VLA 1
@@ -64,6 +64,10 @@ CHECK_TYPE_SIZE("long"   GDCM_SIZEOF_LONG)
 CHECK_TYPE_SIZE("float"  GDCM_SIZEOF_FLOAT)
 CHECK_TYPE_SIZE("double" GDCM_SIZEOF_DOUBLE)
 
+CHECK_TYPE_SIZE("uint"   GDCM_SIZEOF_UINT)
+CHECK_TYPE_SIZE("ushort" GDCM_SIZEOF_USHORT)
+CHECK_TYPE_SIZE("ulong"  GDCM_SIZEOF_ULONG)
+
 CHECK_TYPE_SIZE("long long" GDCM_SIZEOF_LONG_LONG)
 CHECK_TYPE_SIZE("__int64"   GDCM_SIZEOF___INT64)
 
@@ -72,7 +76,7 @@ IF(GDCM_SIZEOF___INT64)
     MESSAGE(STATUS "Checking whether long and __int64 are the same type")
     TRY_COMPILE(GDCM_TYPE_SAME_LONG_AND___INT64
       ${GDCM_BINARY_DIR}/CMakeTmp
-      ${GDCM_SOURCE_DIR}/CMake/vtkTestCompareTypes.cxx
+      ${GDCM_SOURCE_DIR}/CMake/gdcmTestCompareTypes.cxx
       COMPILE_DEFINITIONS
       -DGDCM_TEST_COMPARE_TYPE_1=long
       -DGDCM_TEST_COMPARE_TYPE_2=__int64
@@ -98,7 +102,7 @@ IF(GDCM_SIZEOF___INT64)
       MESSAGE(STATUS "Checking whether long long and __int64 are the same type")
       TRY_COMPILE(GDCM_TYPE_SAME_LONG_LONG_AND___INT64
         ${GDCM_BINARY_DIR}/CMakeTmp
-        ${GDCM_SOURCE_DIR}/CMake/vtkTestCompareTypes.cxx
+        ${GDCM_SOURCE_DIR}/CMake/gdcmTestCompareTypes.cxx
         COMPILE_DEFINITIONS
         -DGDCM_TEST_COMPARE_TYPE_1=TYPE_LONG_LONG
         -DGDCM_TEST_COMPARE_TYPE_2=__int64
@@ -128,7 +132,7 @@ IF(GDCM_SIZEOF___INT64)
         MESSAGE(STATUS "Checking whether unsigned __int64 can convert to double")
         TRY_COMPILE(GDCM_TYPE_CONVERT_UI64_TO_DOUBLE
           ${GDCM_BINARY_DIR}/CMakeTmp
-          ${GDCM_SOURCE_DIR}/CMake/vtkTestConvertTypes.cxx
+          ${GDCM_SOURCE_DIR}/CMake/gdcmTestConvertTypes.cxx
           COMPILE_DEFINITIONS
           -DGDCM_TEST_CONVERT_TYPE_FROM=TYPE_UNSIGNED___INT64
           -DGDCM_TEST_CONVERT_TYPE_TO=double
@@ -172,6 +176,6 @@ IF(GDCM_SIZEOF___INT64)
 ENDIF(GDCM_SIZEOF___INT64)
 
 CONFIGURE_FILE(
-  ${JASPER_SOURCE_DIR}/src/libjasper/include/jasper/jas_config.h.in
-  ${JASPER_BINARY_DIR}/src/libjasper/include/jasper/jas_config.h
+  "${GDCMJASPER_SOURCE_DIR}/src/libjasper/include/jasper/jas_config.h.in"
+  "${GDCMJASPER_BINARY_DIR}/src/libjasper/include/jasper/jas_config.h"
   @ONLY IMMEDIATE)