OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Bård Skaflestad 2013-08-06 21:56:00 +02:00
commit af07e2cb76
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/Modules/UseOpenMP.cmake
View File

@ -23,6 +23,12 @@
include (AddOptions) include (AddOptions)
macro (find_openmp opm) macro (find_openmp opm)
# default is that OpenMP is not considered to be there; if we set this
# to a blank definition, it may be added but it cannot be removed if
# it propagates to other projects (someone declares it to be part of
# _CONFIG_VARS)
set (HAVE_OPENMP)
# user code can be conservative by setting USE_OPENMP_DEFAULT # user code can be conservative by setting USE_OPENMP_DEFAULT
if (NOT DEFINED USE_OPENMP_DEFAULT) if (NOT DEFINED USE_OPENMP_DEFAULT)
set (USE_OPENMP_DEFAULT ON) set (USE_OPENMP_DEFAULT ON)
@ -37,6 +43,7 @@ macro (find_openmp opm)
if (OPENMP_FOUND) if (OPENMP_FOUND)
add_options (C ALL_BUILDS "${OpenMP_C_FLAGS}") add_options (C ALL_BUILDS "${OpenMP_C_FLAGS}")
add_options (CXX ALL_BUILDS "${OpenMP_CXX_FLAGS}") add_options (CXX ALL_BUILDS "${OpenMP_CXX_FLAGS}")
set (HAVE_OPENMP 1)
endif (OPENMP_FOUND) endif (OPENMP_FOUND)
# threading library (search for this *after* OpenMP # threading library (search for this *after* OpenMP