ENH: Ok since OJ warnings are not going to be fixed anytime soon remove them

[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 79865a5a236ca781ae224fe34fddd6fc027610ec..3769191a0b0e5cf88e78ba43fb6d2059aecadb48 100644 (file)
--- a/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
@@ -1,5 +1,4 @@
-#INCLUDE_REGULAR_EXPRESSION("^(jas).*$")
-
+INCLUDE_REGULAR_EXPRESSION("^.*$") 
 
 #libjasperinclude_HEADERS = \
 #  jasper.h \
@@ -25,24 +24,26 @@
 
 SET(JAS_VERSION "1.701.0")
 
-CHECK_INCLUDE_FILE("dlfcn.h"       HAVE_DLFCN_H)
-CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H)
+INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
+
+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,15 +65,29 @@ 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)
 
 IF(GDCM_SIZEOF___INT64)
+  STRING(ASCII 35 POUND)
+  FILE(WRITE ${GDCMJASPER_BINARY_DIR}/gdcmTestCompareTypes.cxx
+    "${POUND}define TYPE_LONG_LONG long long\n"
+    "typedef GDCM_TEST_COMPARE_TYPE_1 Type1;\n"
+    "typedef GDCM_TEST_COMPARE_TYPE_2 Type2;\n"
+    "void function(Type1**) {}\n"
+    "int main() {\n"
+    "  Type2** p = 0;\n"
+    "  function(p);\n"
+    "  return 0; }")
   IF("GDCM_TYPE_SAME_LONG_AND___INT64" MATCHES "^GDCM_TYPE_SAME_LONG_AND___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/gdcmTestCompareTypes.cxx
+      ${GDCMJASPER_BINARY_DIR}/
+      ${GDCMJASPER_BINARY_DIR}/gdcmTestCompareTypes.cxx
       COMPILE_DEFINITIONS
       -DGDCM_TEST_COMPARE_TYPE_1=long
       -DGDCM_TEST_COMPARE_TYPE_2=__int64
@@ -97,8 +112,8 @@ IF(GDCM_SIZEOF___INT64)
     IF("GDCM_TYPE_SAME_LONG_LONG_AND___INT64" MATCHES "^GDCM_TYPE_SAME_LONG_LONG_AND___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/gdcmTestCompareTypes.cxx
+        ${GDCMJASPER_BINARY_DIR}
+        ${GDCMJASPER_BINARY_DIR}/gdcmTestCompareTypes.cxx
         COMPILE_DEFINITIONS
         -DGDCM_TEST_COMPARE_TYPE_1=TYPE_LONG_LONG
         -DGDCM_TEST_COMPARE_TYPE_2=__int64
@@ -126,9 +141,20 @@ IF(GDCM_SIZEOF___INT64)
       # "Visual C++ Processor Pack" is installed.
       IF("GDCM_TYPE_CONVERT_UI64_TO_DOUBLE" MATCHES "^GDCM_TYPE_CONVERT_UI64_TO_DOUBLE$")
         MESSAGE(STATUS "Checking whether unsigned __int64 can convert to double")
+        FILE(WRITE ${GDCMJASPER_BINARY_DIR}/gdcmTestConvertTypes.cxx
+          "${POUND}define TYPE_UNSIGNED___INT64 unsigned __int64\n"
+          "typedef GDCM_TEST_CONVERT_TYPE_TO TypeTo;\n"
+          "typedef GDCM_TEST_CONVERT_TYPE_FROM TypeFrom;\n"
+          "void function(TypeTo& l, TypeFrom const& r) {\n"
+          "  l = static_cast<TypeTo>(r); }\n"
+          "int main() {\n"
+          "  TypeTo tTo = TypeTo();\n"
+          "  TypeFrom tFrom = TypeFrom();\n"
+          "  function(tTo, tFrom);\n"
+          "  return 0; }")
         TRY_COMPILE(GDCM_TYPE_CONVERT_UI64_TO_DOUBLE
-          ${GDCM_BINARY_DIR}/CMakeTmp
-          ${GDCM_SOURCE_DIR}/CMake/gdcmTestConvertTypes.cxx
+          ${GDCMJASPER_BINARY_DIR}
+          ${GDCMJASPER_BINARY_DIR}/gdcmTestConvertTypes.cxx
           COMPILE_DEFINITIONS
           -DGDCM_TEST_CONVERT_TYPE_FROM=TYPE_UNSIGNED___INT64
           -DGDCM_TEST_CONVERT_TYPE_TO=double
@@ -171,7 +197,16 @@ IF(GDCM_SIZEOF___INT64)
   ENDIF(NOT GDCM_TYPE_SAME_LONG_AND___INT64)
 ENDIF(GDCM_SIZEOF___INT64)
 
+IF (WIN32)
+  IF (BUILD_SHARED_LIBS)
+#    ADD_DEFINITIONS(-DJASPERDLL)
+    SET(JASPERDLL 1)
+  ELSE (BUILD_SHARED_LIBS)
+    SET(JASPERSTATIC 1)
+  ENDIF (BUILD_SHARED_LIBS)
+ENDIF (WIN32)
+
 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)