[Cmake-commits] CMake branch, master, updated. v3.10.2-850-gc2bed75

[Kitware Robot]

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, master has been updated
       via  c2bed75ebed14345cd1cf5f1e4c75eac6e8cb3ff (commit)
       via  ffa6f8752b6928190c61ccb32f9c2776de422ad2 (commit)
      from  5c3c70201d225359e235e53132788e6f75c2661b (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=c2bed75ebed14345cd1cf5f1e4c75eac6e8cb3ff
commit c2bed75ebed14345cd1cf5f1e4c75eac6e8cb3ff
Merge: 5c3c702 ffa6f87
Author:     Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Mon Jan 22 14:17:00 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jan 22 09:17:06 2018 -0500

    Merge topic 'findopenmp-genex'
    
    ffa6f875 FindOpenMP: Employ genex where possible
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1676


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ffa6f8752b6928190c61ccb32f9c2776de422ad2
commit ffa6f8752b6928190c61ccb32f9c2776de422ad2
Author:     Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Fri Jan 19 14:09:32 2018 +0100
Commit:     Christian Pfeiffer <cpfeiffer at live.de>
CommitDate: Fri Jan 19 16:38:52 2018 +0100

    FindOpenMP: Employ genex where possible
    
    Fixes: #17610

diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake
index 893ddc6..ced092e 100644
--- a/Modules/FindOpenMP.cmake
+++ b/Modules/FindOpenMP.cmake
@@ -470,7 +470,7 @@ foreach(LANG IN LISTS OpenMP_FINDLIST)
       if(OpenMP_${LANG}_FLAGS)
         separate_arguments(_OpenMP_${LANG}_OPTIONS NATIVE_COMMAND "${OpenMP_${LANG}_FLAGS}")
         set_property(TARGET OpenMP::OpenMP_${LANG} PROPERTY
-          INTERFACE_COMPILE_OPTIONS "${_OpenMP_${LANG}_OPTIONS}")
+          INTERFACE_COMPILE_OPTIONS "$<$<COMPILE_LANGUAGE:${LANG}>:${_OpenMP_${LANG}_OPTIONS}>")
         unset(_OpenMP_${LANG}_OPTIONS)
       endif()
       if(OpenMP_${LANG}_LIBRARIES)

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

Summary of changes:
 Modules/FindOpenMP.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake