Merge pull request #86 from spam-depository/master

Add cmake options for Jasper and OpenJPEG

console/CMakeLists.txt

@@ -17,9 +17,6 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     # using Visual Studio C++
 endif ()
 
-add_definitions(-DmyDisableJasper)
-add_definitions(-DmyDisableOpenJPEG)
-
 add_executable(dcm2niix
         main_console.cpp
         nii_dicom.cpp
@@ -46,6 +43,26 @@ if (USE_SYSTEM_TURBOJPEG)
   target_link_libraries(dcm2niix ${TurboJPEG_LIBRARIES})
 endif ()
 
+option(USE_OPENJPEG "Compile with OpenJPEG support" OFF)
+if (USE_OPENJPEG)
+  find_package(OpenJPEG REQUIRED)
+  add_definitions(-DmyEnableOpenJPEG)
+  target_include_directories(dcm2niix PRIVATE ${OPENJPEG_INCLUDE_DIR})
+  target_link_libraries(dcm2niix ${OPENJPEG_LIBRARIES})
+else ()
+  add_definitions(-DmyDisableOpenJPEG)
+endif ()
+
+option(USE_JASPER "Compile with Jasper support" OFF)
+if (USE_JASPER)
+  find_package(Jasper REQUIRED)
+  add_definitions(-DmyEnableJasper)
+  target_include_directories(dcm2niix PRIVATE ${JASPER_INCLUDE_DIR})
+  target_link_libraries(dcm2niix ${JASPER_LIBRARIES})
+else ()
+  add_definitions(-DmyDisableJASPER)
+endif ()
+
 if (BATCH_VERSION)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
@@ -91,6 +108,16 @@ if (BATCH_VERSION)
 		ADD_DEFINITIONS(-DmyDisableMiniZ)
   		TARGET_LINK_LIBRARIES(dcm2niibatch z)
 	endif(ZLIB_FOUND)
+    if(JASPER_FOUND)
+        TARGET_LINK_LIBRARIES(dcm2niibatch ${JASPER_LIBRARIES})
+    else(JASPER_FOUND)
+        ADD_DEFINITIONS(-DmyDisableJASPER)
+    endif(JASPER_FOUND)
+    if(OPENJPEG_FOUND)
+        TARGET_LINK_LIBRARIES(dcm2niibatch ${OPENJPEG_LIBRARIES})
+    else(OPENJPEG_FOUND)
+        ADD_DEFINITIONS(-DmyDisableOpenJPEG)
+    endif(OPENJPEG_FOUND)
     if (YAML_CPP_LIBRARY)
         target_link_libraries(dcm2niibatch ${YAML_CPP_LIBRARY})
     else()