kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'simplify-findopenmp' 

0110262 FindOpenMP: simplify check for enabled languages
This commit is contained in:
David Cole 2012-03-02 11:44:15 -05:00 committed by CMake Topic Stage
parent 973eba57f9 0110262a2d
commit fe8fbc6b48
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/FindOpenMP.cmake
View File

@ -25,11 +25,6 @@
# (To distribute this file outside of CMake, substitute the full # (To distribute this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
get_property(_ENABLED_LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES)
list(FIND _ENABLED_LANGUAGES "C" _HAVE_LANGUAGE_C)
list(FIND _ENABLED_LANGUAGES "CXX" _HAVE_LANGUAGE_CXX)
unset(_ENABLED_LANGUAGES)
set(_OPENMP_REQUIRED_VARS) set(_OPENMP_REQUIRED_VARS)
function(_OPENMP_FLAG_CANDIDATES LANG) function(_OPENMP_FLAG_CANDIDATES LANG)
@ -93,7 +88,7 @@ int main() {
") ")
# check c compiler # check c compiler
if(NOT _HAVE_LANGUAGE_C EQUAL -1) if(CMAKE_C_COMPILER_LOADED)
# if these are set then do not try to find them again, # if these are set then do not try to find them again,
# by avoiding any try_compiles for the flags # by avoiding any try_compiles for the flags
if(OpenMP_C_FLAGS) if(OpenMP_C_FLAGS)
@ -124,7 +119,7 @@ if(NOT _HAVE_LANGUAGE_C EQUAL -1)
endif() endif()
# check cxx compiler # check cxx compiler
if(NOT _HAVE_LANGUAGE_CXX EQUAL -1) if(CMAKE_CXX_COMPILER_LOADED)
# if these are set then do not try to find them again, # if these are set then do not try to find them again,
# by avoiding any try_compiles for the flags # by avoiding any try_compiles for the flags
if(OpenMP_CXX_FLAGS) if(OpenMP_CXX_FLAGS)
@ -158,9 +153,6 @@ if(NOT _HAVE_LANGUAGE_CXX EQUAL -1)
unset(OpenMP_CXX_TEST_SOURCE) unset(OpenMP_CXX_TEST_SOURCE)
endif() endif()
unset(_HAVE_LANGUAGE_C)
unset(_HAVE_LANGUAGE_CXX)
if(_OPENMP_REQUIRED_VARS) if(_OPENMP_REQUIRED_VARS)
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)