diff --git a/SuperBuild/CMake/External_otb.cmake b/SuperBuild/CMake/External_otb.cmake index 1ae6a91b1ea6f213f361b646e1367e780a354f01..465683a9b48222947d20f7fdf5354dc4d8f6c0ce 100644 --- a/SuperBuild/CMake/External_otb.cmake +++ b/SuperBuild/CMake/External_otb.cmake @@ -28,11 +28,6 @@ ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(OTB GDAL OSSIM ITK TINYXML BOOST) ##get_property(OTB_DEPENDENCIES GLOBAL PROPERTY GLOBAL_OTB_DEPENDENCIES) -set(OTB_USE_OPENMP TRUE) -if(WIN32) - set(OTB_USE_OPENMP FALSE) -endif() - if(OTB_USE_CURL) ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(OTB CURL) ADD_SUPERBUILD_CMAKE_VAR(OTB CURL_INCLUDE_DIR) diff --git a/SuperBuild/CMake/External_shark.cmake b/SuperBuild/CMake/External_shark.cmake index 0bad66b122c170395f0adc5a31b1d88dc949c975..ce8486db084935352b4266fc384f40be3604a29c 100644 --- a/SuperBuild/CMake/External_shark.cmake +++ b/SuperBuild/CMake/External_shark.cmake @@ -28,15 +28,6 @@ ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(SHARK BOOST) ADD_SUPERBUILD_CMAKE_VAR(SHARK Boost_INCLUDE_DIR) ADD_SUPERBUILD_CMAKE_VAR(SHARK BOOST_LIBRARYDIR) -#set(SHARK_CMAKE_CACHE_ARGS ${SB_CMAKE_CACHE_ARGS}) -# if(LINUX) -# string(REGEX REPLACE -# "-Wl,--no-undefined" -# "-Wl,--no-undefined -Wl,-no-as-needed" -# SHARK_CMAKE_CACHE_ARGS -# "${SHARK_CMAKE_CACHE_ARGS}") -# endif() - ExternalProject_Add(SHARK PREFIX SHARK URL "https://github.com/Shark-ML/Shark/archive/349f29bd71c370e0f88f7fc9aa66fa5c4768fcb0.zip" @@ -53,6 +44,7 @@ ExternalProject_Add(SHARK -DBUILD_TESTING:BOOL=OFF -DENABLE_HDF5:BOOL=OFF -DENABLE_CBLAS:BOOL=OFF + -DENABLE_OPENMP:BOOL=${OTB_USE_OPENMP} ${SHARK_SB_CONFIG} CMAKE_COMMAND ${SB_CMAKE_COMMAND} LOG_DOWNLOAD 1 diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt index a946b3193a063bfb2e949e3c6fb845e56fa0fcf5..e36f7ada41f055b50f03334ec5832ee11984a301 100644 --- a/SuperBuild/CMakeLists.txt +++ b/SuperBuild/CMakeLists.txt @@ -51,6 +51,12 @@ option(BUILD_STATIC_LIBS "Build with static libraries." OFF) option(WITH_REMOTE_MODULES "Build with specific list of remote modules." OFF) set(OTB_ADDITIONAL_CACHE "" CACHE STRING "Additional cmake option for OTB -DVAR:TYPE=VALUE ...") +option(OTB_USE_OPENMP "use openmp" ON) +if(WIN32) + option(OTB_USE_OPENMP "use openmp" OFF) +endif() + + if(APPLE) if(POLICY CMP0042) cmake_policy(SET CMP0042 NEW)