ENH: Including the new header file openjpegConfigure.h

[openjpeg.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee7305a529f1c3f1ffd8af2dac6f6ba9c9aa23ac..8cb57be74a4570b56bc0359cb1d739a43db1e714 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,6 +107,10 @@ ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
 # Test for some required system information.
 INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityC.cmake)
 
+#-----------------------------------------------------------------------------
+# Test for getopt being available in this system
+INCLUDE (${PROJECT_SOURCE_DIR}/CMake/CheckHaveGetopt.cmake )
+
 #-----------------------------------------------------------------------------
 # Setup file for setting custom ctest vars
 CONFIGURE_FILE(
@@ -139,19 +143,24 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in
                @ONLY IMMEDIATE)
 ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in)
 
+#-----------------------------------------------------------------------------
+# Translate CMake configuration options into #defines that can be queried from
+# the code.
+CONFIGURE_FILE(
+   ${PROJECT_SOURCE_DIR}/openjpegConfigure.h.in
+   ${PROJECT_BINARY_DIR}/openjpegConfigure.h)
+
 #-----------------------------------------------------------------------------
 # Always build the library
 INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 SUBDIRS(
   libopenjpeg
   mj2
-  # cmake 2.4.5 has poor java support
-  #j2kviewer/src
+  jpwl
   )
 
 IF(NOT UNIX)
 SUBDIRS(
-  jpwl
   jp3d
   indexer_JPIP
   )