Skip to content

GitLab

Commit 7b360b86 authored by Antoine Regimbeau's avatar Antoine Regimbeau
Browse files
Options

Merge branch 'shark_openmp' into 'release-6.6' 

Shark and OpenMP

See merge request !134
parents 6b3198ce 225b82f9
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
Modules/ThirdParty/Shark/otb-module-init.cmake
View file @ 7b360b86
...@@ -20,8 +20,10 @@ ...@@ -20,8 +20,10 @@
find_package ( Shark REQUIRED ) find_package ( Shark REQUIRED )
if(SHARK_USE_OPENMP AND NOT OTB_USE_OPENMP) if ( SHARK_USE_OPENMP AND NOT OTB_USE_OPENMP )
message(WARNING "Shark library is built with OpenMP and you have OTB_USE_OPENMP set to OFF.") message(WARNING "Shark library is built with OpenMP and you have OTB_USE_OPENMP set to OFF.\
It will be turned to ON to allow compilation.")
set( OTB_USE_OPENMP "ON" CACHE BOOL "Add openmp compiler and linker flags" FORCE )
endif() endif()
mark_as_advanced( Shark_DIR ) mark_as_advanced( Shark_DIR )
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment