X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmopenjpeg%2FCMakeLists.txt;h=c8f6e7c2afee99744cfab49acfd547616f880ae9;hb=48215bafde3d6955d9cd60e074f6d6832ea9752f;hp=94fa53f0f4f387b2b2c44c94b3d9a7843fbb6f79;hpb=7452f3039ff4dd2574fcbf3343b530a2f20f9623;p=gdcm.git

diff --git a/src/gdcmopenjpeg/CMakeLists.txt b/src/gdcmopenjpeg/CMakeLists.txt
index 94fa53f0..c8f6e7c2 100644
--- a/src/gdcmopenjpeg/CMakeLists.txt
+++ b/src/gdcmopenjpeg/CMakeLists.txt
@@ -1,24 +1,42 @@
-PROJECT(OPENJPEG)
+PROJECT(OPENJPEG C)
 
 #-----------------------------------------------------------------------------
 # OPENJPEG version number, usefull for packaging and doxygen doc:
-SET(OPENJPEG_MAJOR_VERSION 0)
-SET(OPENJPEG_MINOR_VERSION 97)
+SET(OPENJPEG_MAJOR_VERSION 1)
+SET(OPENJPEG_MINOR_VERSION 0)
 SET(OPENJPEG_BUILD_VERSION 0)
 SET(OPENJPEG_VERSION
-      "${OPENJPEG_MAJOR_VERSION}.${OPENJPEG_MINOR_VERSION}.${OPENJPEG_BUILD_VERSION}")
+  "${OPENJPEG_MAJOR_VERSION}.${OPENJPEG_MINOR_VERSION}.${OPENJPEG_BUILD_VERSION}")
 
 #-----------------------------------------------------------------------------
-# Build shared lib by default
-OPTION(OPENJPEG_BUILD_SHARED_LIBS "Build OPENJPEG with shared libraries." ON)
-SET(BUILD_SHARED_LIBS ${OPENJPEG_BUILD_SHARED_LIBS})
+# OpenJPEG build configuration options.
+OPTION(BUILD_SHARED_LIBS "Build OpenJPEG with shared libraries." OFF)
 
 #-----------------------------------------------------------------------------
-SET (EXECUTABLE_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
-SET (LIBRARY_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
-MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
+# For the codec...
+OPTION(BUILD_EXAMPLES "Build the Examples (codec...)." OFF)
 
+#-----------------------------------------------------------------------------
+# Always build the library
 SUBDIRS(
-    libopenjpeg
-    codec
-    )
+  libopenjpeg
+  )
+#-----------------------------------------------------------------------------
+# Build example only if requested
+IF(BUILD_EXAMPLES)
+  SUBDIRS(codec)
+ENDIF(BUILD_EXAMPLES)
+
+#-----------------------------------------------------------------------------
+# For openjpeg team if they ever want Dart+CMake
+IF(OPJ_STANDALONE)
+  INCLUDE(Dart)
+  MARK_AS_ADVANCED(BUILD_TESTING DART_ROOT TCL_TCLSH)
+  IF(BUILD_TESTING)
+    ENABLE_TESTING()
+  ENDIF(BUILD_TESTING)
+ENDIF(OPJ_STANDALONE)
+
+# TODO, technically we should add tests, e.g:
+# http://www.crc.ricoh.com/~gormish/jpeg2000conformance/
+