diff --git a/SuperBuild/CMake/External_otb.cmake b/SuperBuild/CMake/External_otb.cmake index b9a2acf3711f5cfaa433633a6068aabe17aff60d..00f5933bb65671d5f94f71803a4d9ef0703a2c82 100644 --- a/SuperBuild/CMake/External_otb.cmake +++ b/SuperBuild/CMake/External_otb.cmake @@ -24,7 +24,7 @@ SETUP_SUPERBUILD(OTB) set(OTB_SB_SRC ${CMAKE_SOURCE_DIR}/..) -ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(OTB GDAL OSSIM ITK TINYXML BOOST GSL) +ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(OTB GDAL OSSIM ITK TINYXML BOOST) ##get_property(OTB_DEPENDENCIES GLOBAL PROPERTY GLOBAL_OTB_DEPENDENCIES) @@ -114,6 +114,13 @@ if(OTB_USE_QWT) ADD_SUPERBUILD_CMAKE_VAR(OTB QWT_LIBRARY) endif() +if(OTB_USE_GSL) + ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(OTB GSL) + ADD_SUPERBUILD_CMAKE_VAR(OTB GSL_INCLUDE_DIR) + ADD_SUPERBUILD_CMAKE_VAR(OTB GSL_LIBRARY) +endif() + + ADD_SUPERBUILD_CMAKE_VAR(OTB GDAL_INCLUDE_DIR) ADD_SUPERBUILD_CMAKE_VAR(OTB GDAL_LIBRARY) @@ -134,6 +141,13 @@ if(WITH_REMOTE_MODULES) foreach(remote_module SertitObject Mosaic otbGRM OTBFFSforGMM OTBTemporalGapFilling) list(APPEND OTB_MODULES_CONFIG -DModule_${remote_module}:BOOL=ON) endforeach() + + # Add CESBIO'S remote modules if OTB is compiled with GSL support (for now only TemporalGapFilling) + if(OTB_USE_GSL) + foreach(remote_module OTBTemporalGapFilling) + list(APPEND OTB_MODULES_CONFIG -DModule_${remote_module}:BOOL=ON) + endforeach() + endif() else() set(OTB_MODULES_CONFIG) endif() @@ -185,6 +199,7 @@ ExternalProject_Add(OTB -DOTB_USE_GLUT:BOOL=${OTB_USE_GLUT} -DOTB_USE_QWT:BOOL=${OTB_USE_QWT} -DOTB_USE_OPENMP:BOOL=${OTB_USE_OPENMP} + -DOTB_USE_GSL:BOOL=${OTB_USE_GSL} -DOTB_WRAP_PYTHON:BOOL=${OTB_WRAP_PYTHON} -DOTB_WRAP_JAVA:BOOL=${OTB_WRAP_JAVA} ${OTB_ADDITIONAL_CACHE} diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt index 1b10878a3e7f1827db3895cdb4cec8995c82013e..b75b778c9c5826100d37865608fe2ea39c633ea3 100644 --- a/SuperBuild/CMakeLists.txt +++ b/SuperBuild/CMakeLists.txt @@ -325,6 +325,7 @@ endif() option(OTB_USE_SHARK "Enable module Shark in OTB" ON) option(OTB_USE_QWT "Enable module QWT in OTB" ON) +option(OTB_USE_GSL "Enable module GSL in OTB" ON) # set OTB_DATA_ROOT to run test find_path(OTB_DATA_ROOT README-OTB-Data