[trunk] separate the opj_config file between public and private part to avoid expose...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bb62e61224612b25a3883bf73cb1a8e4995bed5..c55f46f80ed45c7510a1d8d9d0a39032be4d93c7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,8 +211,6 @@ CHECK_INCLUDE_FILE("unistd.h"       HAVE_UNISTD_H)
 include(TestLargeFiles)
 OPJ_TEST_LARGE_FILES(OPJ_HAVE_LARGEFILES)
 
-
-
 #-----------------------------------------------------------------------------
 # Build Library
 add_subdirectory(src)
@@ -249,6 +247,12 @@ configure_file(
  ${CMAKE_CURRENT_BINARY_DIR}/src/lib/openjp2/opj_config.h
  @ONLY
  )
+ 
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/opj_config_private.h.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/src/lib/openjp2/opj_config_private.h
+ @ONLY
+ )
 
 #-----------------------------------------------------------------------------
 # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)

diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
index a63598904350c36bcac2fcb3a072489d4ff98aaa..5c87f29771cecb3710ed50feaaf7137d83f503f9 100644 (file)
--- a/src/lib/openjp2/CMakeLists.txt
+++ b/src/lib/openjp2/CMakeLists.txt
@@ -5,7 +5,7 @@ install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers)
 
 include_directories(
-  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
+  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h and opj_config_private.h
 )
 # Defines the source code for the library
 set(OPENJPEG_SRCS

diff --git a/src/lib/openjp2/openjpeg.c b/src/lib/openjp2/openjpeg.c
index ec9746f732ef0f49e480f243a8815ae5ebf2e1a9..e7ca5f80219cd8afb5a5323430de66a2de11ac3d 100644 (file)
--- a/src/lib/openjp2/openjpeg.c
+++ b/src/lib/openjp2/openjpeg.c
@@ -30,7 +30,6 @@
 #include <windows.h>
 #endif /* _WIN32 */
 
-#include "opj_config.h"
 #include "opj_includes.h"
 
 /**

diff --git a/src/lib/openjp2/opj_config.h.cmake.in b/src/lib/openjp2/opj_config.h.cmake.in
index d922d1169b7ddf0b1e23061475f0f3aa9f30105f..2f5311b87cd56f256833a21056531a2e7b4a9a5d 100644 (file)
--- a/src/lib/openjp2/opj_config.h.cmake.in
+++ b/src/lib/openjp2/opj_config.h.cmake.in
@@ -1,34 +1,2 @@
-/* create config.h for CMake */
+/* create opj_config.h for CMake */
 #cmakedefine OPJ_HAVE_STDINT_H                 @OPJ_HAVE_STDINT_H@
-#cmakedefine OPJ_HAVE_INTTYPES_H       @OPJ_HAVE_INTTYPES_H@
-
-#define OPJ_PACKAGE_VERSION "@PACKAGE_VERSION@"
-
-/* Not used by openjp2*/
-/*#cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@*/
-/*#cmakedefine HAVE_STDLIB_H @HAVE_STDLIB_H@*/
-/*#cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@*/
-/*#cmakedefine HAVE_STRING_H @HAVE_STRING_H@*/
-/*#cmakedefine HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@*/
-/*#cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@ */
-/*#cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@*/
-
-#cmakedefine _LARGEFILE_SOURCE
-#cmakedefine _LARGE_FILES
-#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@
-#cmakedefine OPJ_HAVE_FSEEKO @OPJ_HAVE_FSEEKO@
-
-
-/* Byte order.  */
-/* All compilers that support Mac OS X define either __BIG_ENDIAN__ or
-__LITTLE_ENDIAN__ to match the endianness of the architecture being
-compiled for. This is not necessarily the same as the architecture of the
-machine doing the building. In order to support Universal Binaries on
-Mac OS X, we prefer those defines to decide the endianness.
-On other platforms we use the result of the TRY_RUN. */
-#if !defined(__APPLE__)
-#cmakedefine OPJ_BIG_ENDIAN
-#elif defined(__BIG_ENDIAN__)
-# define OPJ_BIG_ENDIAN
-#endif
-

diff --git a/src/lib/openjp2/opj_config_private.h.cmake.in b/src/lib/openjp2/opj_config_private.h.cmake.in
new file mode 100644 (file)
index 0000000..8a02c79
--- /dev/null
+++ b/src/lib/openjp2/opj_config_private.h.cmake.in
@@ -0,0 +1,31 @@
+/* create opj_config_private.h for CMake */
+#cmakedefine OPJ_HAVE_INTTYPES_H       @OPJ_HAVE_INTTYPES_H@
+
+#define OPJ_PACKAGE_VERSION "@PACKAGE_VERSION@"
+
+/* Not used by openjp2*/
+/*#cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@*/
+/*#cmakedefine HAVE_STDLIB_H @HAVE_STDLIB_H@*/
+/*#cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@*/
+/*#cmakedefine HAVE_STRING_H @HAVE_STRING_H@*/
+/*#cmakedefine HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@*/
+/*#cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@ */
+/*#cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@*/
+
+#cmakedefine _LARGEFILE_SOURCE
+#cmakedefine _LARGE_FILES
+#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@
+#cmakedefine OPJ_HAVE_FSEEKO @OPJ_HAVE_FSEEKO@
+
+/* Byte order.  */
+/* All compilers that support Mac OS X define either __BIG_ENDIAN__ or
+__LITTLE_ENDIAN__ to match the endianness of the architecture being
+compiled for. This is not necessarily the same as the architecture of the
+machine doing the building. In order to support Universal Binaries on
+Mac OS X, we prefer those defines to decide the endianness.
+On other platforms we use the result of the TRY_RUN. */
+#if !defined(__APPLE__)
+#cmakedefine OPJ_BIG_ENDIAN
+#elif defined(__BIG_ENDIAN__)
+# define OPJ_BIG_ENDIAN
+#endif
\ No newline at end of file

diff --git a/src/lib/openjp2/opj_includes.h b/src/lib/openjp2/opj_includes.h
index 82cc9c19bc29b49549165e6c624bdab654a08eb3..9d74e470c51d88a56f11bcc08632ed752ed29f9c 100644 (file)
--- a/src/lib/openjp2/opj_includes.h
+++ b/src/lib/openjp2/opj_includes.h
@@ -32,7 +32,7 @@
  * This must be included before any system headers,
  * since they can react to macro defined there
  */
-#include "opj_config.h"
+#include "opj_config_private.h"
 
 /*
  ==========================================================