[Cmake-commits] CMake branch, next, updated. v2.8.7-2802-g0a8634a

Rolf Eike Beer eike at sf-mail.de
Wed Feb 22 11:51:25 EST 2012


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0a8634a82fd914adb1d2c3907438c1cfc97b7b43 (commit)
       via  0110262a2d93da0911f7439ac5fba4e18b29757e (commit)
      from  4789bae0797b09feb300dcd97f1ca362bbf35ff7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a8634a82fd914adb1d2c3907438c1cfc97b7b43
commit 0a8634a82fd914adb1d2c3907438c1cfc97b7b43
Merge: 4789bae 0110262
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Feb 22 11:51:22 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 22 11:51:22 2012 -0500

    Merge topic 'simplify-findopenmp' into next
    
    0110262 FindOpenMP: simplify check for enabled languages


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0110262a2d93da0911f7439ac5fba4e18b29757e
commit 0110262a2d93da0911f7439ac5fba4e18b29757e
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Feb 22 17:47:52 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Feb 22 17:47:52 2012 +0100

    FindOpenMP: simplify check for enabled languages

diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake
index e1af15e..b96a2ec 100644
--- a/Modules/FindOpenMP.cmake
+++ b/Modules/FindOpenMP.cmake
@@ -25,11 +25,6 @@
 # (To distribute this file outside of CMake, substitute the full
 #  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)
 
 function(_OPENMP_FLAG_CANDIDATES LANG)
@@ -93,7 +88,7 @@ int main() {
 ")
 
 # 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,
   # by avoiding any try_compiles for the flags
   if(OpenMP_C_FLAGS)
@@ -124,7 +119,7 @@ if(NOT _HAVE_LANGUAGE_C EQUAL -1)
 endif()
 
 # 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,
   # by avoiding any try_compiles for the flags
   if(OpenMP_CXX_FLAGS)
@@ -158,9 +153,6 @@ if(NOT _HAVE_LANGUAGE_CXX EQUAL -1)
   unset(OpenMP_CXX_TEST_SOURCE)
 endif()
 
-unset(_HAVE_LANGUAGE_C)
-unset(_HAVE_LANGUAGE_CXX)
-
 if(_OPENMP_REQUIRED_VARS)
   include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindOpenMP.cmake |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list