Commit 75eb81fa authored by Thomas Feuvrier's avatar Thomas Feuvrier

OpenJpeg : Certaines options Cmake et dans openjpeg.h ont été remise comme...

OpenJpeg : Certaines options Cmake et dans openjpeg.h ont été remise comme "avant" (version origine).
RAF :
- mangling pour éviter conflit avec openjpeg d'ITK
- correction OSSIM modifier pour link jpeg avec celle itk
parent e0702ff2
......@@ -71,15 +71,15 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/opj_configure.h.in
${CMAKE_CURRENT_BINARY_DIR}/opj_configure.h)
#-----------------------------------------------------------------------------
IF(OTB_BUILD_SHARED_LIBS)
ADD_DEFINITIONS(-DOPJ_EXPORTS)
ELSE(OTB_BUILD_SHARED_LIBS)
ADD_DEFINITIONS(-DOPJ_STATIC)
ENDIF(OTB_BUILD_SHARED_LIBS)
IF(CYGWIN OR MINGW)
ADD_DEFINITIONS(-DWIN32)
ENDIF(CYGWIN OR MINGW)
# IF(OTB_BUILD_SHARED_LIBS)
# ADD_DEFINITIONS(-DOPJ_EXPORTS)
# ELSE(OTB_BUILD_SHARED_LIBS)
# ADD_DEFINITIONS(-DOPJ_STATIC)
# ENDIF(OTB_BUILD_SHARED_LIBS)
# IF(CYGWIN OR MINGW)
# ADD_DEFINITIONS(-DWIN32)
# ENDIF(CYGWIN OR MINGW)
#-----------------------------------------------------------------------------
# Always build the library
......
......@@ -32,12 +32,13 @@ IF(CMAKE_COMPILER_IS_GNUCC)
ENDIF(CMAKE_COMPILER_IS_GNUCC)
# Pass proper definition to preprocessor to generate shared lib
IF(OTB_BUILD_SHARED_LIBS)
ADD_DEFINITIONS(-DOPJ_EXPORTS)
ELSE(BUILD_SHARED_LIBS)
ADD_DEFINITIONS(-DOPJ_STATIC)
ENDIF(OTB_BUILD_SHARED_LIBS)
IF (WIN32)
IF (BUILD_SHARED_LIBS)
ADD_DEFINITIONS(-DOPJ_EXPORTS)
ELSE (BUILD_SHARED_LIBS)
ADD_DEFINITIONS(-DOPJ_STATIC)
ENDIF (BUILD_SHARED_LIBS)
ENDIF (WIN32)
IF(ENABLE_PROFILING)
......
......@@ -37,7 +37,9 @@
// Modified by OTB developpers. /TODO check this
// Add specific plateform CYGWIN and MINGW
#if defined(OPJ_STATIC) || !(defined(WIN32) || defined(__WIN32__) || defined(__CYGWIN__) || defined(__MINGW__))
//THOMAS
//#if defined(OPJ_STATIC) || !(defined(WIN32) || defined(__WIN32__) || defined(__CYGWIN__) || defined(__MINGW__))
#if defined(OPJ_STATIC) || !(defined(WIN32) || defined(__WIN32__))
#define OPJ_API
#define OPJ_CALLCONV
#else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment