ENH: enhance the mangling of otbopenjpeg internal library

194da209 · Mickael Savinaud · b07eca54 · 194da209 · 194da209 · 194da209
Commit 194da209 authored 12 years ago by Mickael Savinaud
--- a/Utilities/otbopenjpeg/CMakeLists.txt
+++ b/Utilities/otbopenjpeg/CMakeLists.txt
@@ -151,10 +151,6 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.cmake.in
               ${CMAKE_CURRENT_BINARY_DIR}/openjpeg_mangle.h
               @ONLY IMMEDIATE)

-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle_private.h.cmake.in
-               ${CMAKE_CURRENT_BINARY_DIR}/openjpeg_mangle_private.h
-               @ONLY IMMEDIATE)
-
 #-----------------------------------------------------------------------------
 # pkgconfig support
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY)

--- a/Utilities/otbopenjpeg/libopenjpeg/opj_includes.h
+++ b/Utilities/otbopenjpeg/libopenjpeg/opj_includes.h
@@ -87,7 +87,7 @@
   OpenJPEG interface
 ==========================================================
 */
-#include "openjpeg_mangle_private.h"
+#include "openjpeg_mangle.h"
 #include "openjpeg.h"

 /*

--- a/Utilities/otbopenjpeg/openjpeg_mangle.h.cmake.in
+++ b/Utilities/otbopenjpeg/openjpeg_mangle.h.cmake.in
--- a/Utilities/otbopenjpeg/openjpeg_mangle_private.h.cmake.in
+++ b/Utilities/otbopenjpeg/openjpeg_mangle_private.h.cmake.in