Modif

CMakeLists.txt

@@ -101,6 +101,10 @@ ELSE(OTB_USE_EXTERNAL_ITK)
   IF(OTB_USE_JPEG2000)
         ADD_DEFINITIONS(-DOTB_USE_JPEG2000 -DUSE_OPJ_DEPRECATED)
   ENDIF(OTB_USE_JPEG2000)
+  IF(NOT BUILD_SHARED_LIBS)
+        ADD_DEFINITIONS(-DOPJ_STATIC)
+  ENDIF(NOT BUILD_SHARED_LIBS)
+
 ENDIF(OTB_USE_EXTERNAL_ITK)
 
 #-----------------------------------------------------------------------------

Utilities/otbopenjpeg/CMakeLists.txt

@@ -118,3 +118,8 @@ IF(CMAKE_COMPILER_IS_GNUCC)
   SET(CMAKE_C_FLAGS_RELEASE "-ffast-math ${CMAKE_C_FLAGS_RELEASE}")
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
+#========================================
+# OTB added
+IF(CYGWIN OR MINGW)
+  ADD_DEFINITIONS(-DWIN32)
+ENDIF(CYGWIN OR MINGW)

otbIncludeDirectories.cmake

@@ -44,7 +44,9 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
 )
 # Case for release 2.2.1
 IF(OTB_USE_JPEG2000)
-  SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE} ${OTB_SOURCE_DIR}/Utilities/otbopenjpeg/libopenjpeg)
+  SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE} 
+        ${OTB_SOURCE_DIR}/Utilities/otbopenjpeg
+        ${OTB_SOURCE_DIR}/Utilities/otbopenjpeg/libopenjpeg)
 ENDIF(OTB_USE_JPEG2000)
 
 #-----------------------------------------------------------------------------
@@ -197,7 +199,9 @@ SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
 
 # Case for release 2.2.1
 IF(OTB_USE_JPEG2000)
-  SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE} ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbopenjpeg/libopenjpeg)
+  SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE} 
+        ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbopenjpeg
+        ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbopenjpeg/libopenjpeg)
 ENDIF(OTB_USE_JPEG2000)
 
 #For GDAL header file