[Cmake-commits] CMake branch, next, updated. v3.4.1-1688-g68f9dcb

[Brad King]

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  68f9dcba60f873d3091a1201a88dfdc2e26a1bb1 (commit)
       via  1549927d7dc29476ada7b0c0867e9630ebe6ea00 (commit)
      from  2e600b5a0fc16027df9b2138164bc5268c6fc9b6 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68f9dcba60f873d3091a1201a88dfdc2e26a1bb1
commit 68f9dcba60f873d3091a1201a88dfdc2e26a1bb1
Merge: 2e600b5 1549927
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 10 14:23:30 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 10 14:23:30 2015 -0500

    Merge topic 'FindOpenMP-clang' into next
    
    1549927d FindOpenMP: Add Clang support


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1549927d7dc29476ada7b0c0867e9630ebe6ea00
commit 1549927d7dc29476ada7b0c0867e9630ebe6ea00
Author:     Chris Pavlina <pavlina.chris at gmail.com>
AuthorDate: Thu Dec 10 10:40:27 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 10 14:19:35 2015 -0500

    FindOpenMP: Add Clang support

diff --git a/Help/release/dev/FindOpenMP-clang.rst b/Help/release/dev/FindOpenMP-clang.rst
new file mode 100644
index 0000000..44c805c
--- /dev/null
+++ b/Help/release/dev/FindOpenMP-clang.rst
@@ -0,0 +1,4 @@
+FindOpenMP-clang
+----------------
+
+* The :module:`FindOpenMP` module learned to support Clang.
diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake
index a102c66..ee4bdd6 100644
--- a/Modules/FindOpenMP.cmake
+++ b/Modules/FindOpenMP.cmake
@@ -50,6 +50,8 @@ function(_OPENMP_FLAG_CANDIDATES LANG)
     " "
     #GNU
     "-fopenmp"
+    #Clang
+    "-fopenmp=libomp"
     #Microsoft Visual Studio
     "/openmp"
     #Intel windows
@@ -67,6 +69,7 @@ function(_OPENMP_FLAG_CANDIDATES LANG)
   )
 
   set(OMP_FLAG_GNU "-fopenmp")
+  set(OMP_FLAG_Clang "-fopenmp=libomp")
   set(OMP_FLAG_HP "+Oopenmp")
   if(WIN32)
     set(OMP_FLAG_Intel "-Qopenmp")

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

Summary of changes:
 Help/release/dev/FindOpenMP-clang.rst |    4 ++++
 Modules/FindOpenMP.cmake              |    3 +++
 2 files changed, 7 insertions(+)
 create mode 100644 Help/release/dev/FindOpenMP-clang.rst


hooks/post-receive
-- 
CMake