ENH: Adding support for checking if inline keyword is supported by C compiler

diff --git a/src/gdcmjpegls/CMakeLists.txt b/src/gdcmjpegls/CMakeLists.txt
index 36dd4d94dac24f9a905de7733fb7e66bcfed5ba5..7aca453f14312f5682231e4c9e0f9e23a8979981 100644 (file)
--- a/src/gdcmjpegls/CMakeLists.txt
+++ b/src/gdcmjpegls/CMakeLists.txt
@@ -3,34 +3,31 @@ PROJECT(GDCMJPEGLS)
 #-----------------------------------------------------------------------------
 # Test if os defines a lenght for sockaddr
 # only doing the test when we have sys/socket
-IF( ${CMAKE_HAVE_C_INLINE} )
-  MESSAGE(FATAL_ERROR "bla");
-  IF("HAVE_C_INLINE" MATCHES "^HAVE_C_INLINE$")
-    STRING(ASCII 35 POUND)
-    FILE(WRITE ${GDCMJPEGLS_BINARY_DIR}/gdcmTestInline.c
-      "inline int foo() { return 0; }")
-    MESSAGE(STATUS "Checking if C compiler has inline keyword")
-    TRY_COMPILE(HAVE_C_INLINE
-      ${GDCMJPEGLS_BINARY_DIR}
-      ${GDCMJPEGLS_BINARY_DIR}/gdcmTestHAVESALEN.c
-      OUTPUT_VARIABLE OUTPUT)
-    IF(HAVE_C_INLINE)
-      MESSAGE(STATUS "Checking if C compiler has inline keyword -- yes")
-      SET(HAVE_C_INLINE 1 CACHE INTERNAL "Support if C compiler has inline keyword")
-      WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeOutput.log
-        "Determining if C compiler has inline keyword"
-        "passed with the following output:\n"
-        "${OUTPUT}\n" APPEND)
-    ELSE(HAVE_C_INLINE)
-      MESSAGE(STATUS "Checking if C compiler has inline keyword -- no")
-      SET(HAVE_C_INLINE 0 CACHE INTERNAL "Support if C compiler has inline keyword")
-      WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log
-        "Determining if C compiler has inline keyword"
-        "failed with the following output:\n"
-        "${OUTPUT}\n" APPEND)
-    ENDIF(HAVE_C_INLINE)
-  ENDIF("HAVE_C_INLINE" MATCHES "^HAVE_C_INLINE$")
-ENDIF( ${CMAKE_HAVE_C_INLINE} )
+IF("HAVE_C_INLINE" MATCHES "^HAVE_C_INLINE$")
+  STRING(ASCII 35 POUND)
+  FILE(WRITE ${GDCMJPEGLS_BINARY_DIR}/gdcmTestInline.c
+    "inline int foo() { return 0; }")
+  MESSAGE(STATUS "Checking if C compiler has inline keyword")
+  TRY_COMPILE(HAVE_C_INLINE
+    ${GDCMJPEGLS_BINARY_DIR}
+    ${GDCMJPEGLS_BINARY_DIR}/gdcmTestInline.c
+    OUTPUT_VARIABLE OUTPUT)
+  IF(HAVE_C_INLINE)
+    MESSAGE(STATUS "Checking if C compiler has inline keyword -- yes")
+    SET(HAVE_C_INLINE 1 CACHE INTERNAL "Support if C compiler has inline keyword")
+    WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeOutput.log
+      "Determining if C compiler has inline keyword"
+      "passed with the following output:\n"
+      "${OUTPUT}\n" APPEND)
+  ELSE(HAVE_C_INLINE)
+    MESSAGE(STATUS "Checking if C compiler has inline keyword -- no")
+    SET(HAVE_C_INLINE 0 CACHE INTERNAL "Support if C compiler has inline keyword")
+    WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log
+      "Determining if C compiler has inline keyword"
+      "failed with the following output:\n"
+      "${OUTPUT}\n" APPEND)
+  ENDIF(HAVE_C_INLINE)
+ENDIF("HAVE_C_INLINE" MATCHES "^HAVE_C_INLINE$")
 
 CHECK_INCLUDE_FILE("unistd.h"    HAVE_UNISTD_H)
 CONFIGURE_FILE(

diff --git a/src/gdcmjpegls/jpegls_config.h.in b/src/gdcmjpegls/jpegls_config.h.in
index 159256d0b4291779c6c040dedf3b3201e2a59ec2..5b957f1251d0662553e905583d6ddd209be485a0 100644 (file)
--- a/src/gdcmjpegls/jpegls_config.h.in
+++ b/src/gdcmjpegls/jpegls_config.h.in
@@ -7,6 +7,12 @@
 
 #cmakedefine JPEGLSSTATIC
 
+#cmakedefine HAVE_C_INLINE
+
+#ifndef HAVE_C_INLINE
+#define inline
+#endif
+
 /* a function referenced thru EXTERNs: */
 #if defined( _WIN32 ) && defined (JPEGLSDLL)
 #define GLOBAL(type)            __declspec(dllexport) type