[Cmake-commits] CMake branch, master, updated. v3.9.4-1068-gdbb1672

[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  dbb16722ee0669b52ef15b4ee35c7ca623e400c9 (commit)
       via  508f47de1b4b7ab52abf17bc4feb39637a4005c2 (commit)
       via  312061573932417dc4a6aad9de4164046fb7982e (commit)
       via  f156b2fbfb0cc53a3b29f31942ba7e8f0d2a9184 (commit)
      from  78d4a3db034ac6e15932fb51233c489f8faa360e (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=dbb16722ee0669b52ef15b4ee35c7ca623e400c9
commit dbb16722ee0669b52ef15b4ee35c7ca623e400c9
Merge: 508f47d f156b2f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 5 11:34:18 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Oct 5 07:34:49 2017 -0400

    Merge topic 'find-matlab-r2017b'
    
    f156b2fb FindMatlab: Add support for MATLAB 2017b
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Acked-by: Raffi Enficiaud <raffi.enficiaud at free.fr>
    Merge-request: !1343


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=508f47de1b4b7ab52abf17bc4feb39637a4005c2
commit 508f47de1b4b7ab52abf17bc4feb39637a4005c2
Merge: 78d4a3d 3120615
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 5 11:33:51 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Oct 5 07:34:01 2017 -0400

    Merge topic 'findopenmp-fix-version'
    
    31206157 FindOpenMP: Fix version if OpenMP doesn't work
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1344


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=312061573932417dc4a6aad9de4164046fb7982e
commit 312061573932417dc4a6aad9de4164046fb7982e
Author:     Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Wed Oct 4 18:28:47 2017 +0200
Commit:     Christian Pfeiffer <cpfeiffer at live.de>
CommitDate: Wed Oct 4 19:53:48 2017 +0200

    FindOpenMP: Fix version if OpenMP doesn't work

diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake
index 595b0b3..272f4dc 100644
--- a/Modules/FindOpenMP.cmake
+++ b/Modules/FindOpenMP.cmake
@@ -310,7 +310,11 @@ macro(_OPENMP_SET_VERSION_BY_SPEC_DATE LANG)
     "199710=1.0"
   )
 
-  string(REGEX MATCHALL "${OpenMP_${LANG}_SPEC_DATE}=([0-9]+)\\.([0-9]+)" _version_match "${OpenMP_SPEC_DATE_MAP}")
+  if(OpenMP_${LANG}_SPEC_DATE)
+    string(REGEX MATCHALL "${OpenMP_${LANG}_SPEC_DATE}=([0-9]+)\\.([0-9]+)" _version_match "${OpenMP_SPEC_DATE_MAP}")
+  else()
+    set(_version_match "")
+  endif()
   if(NOT _version_match STREQUAL "")
     set(OpenMP_${LANG}_VERSION_MAJOR ${CMAKE_MATCH_1})
     set(OpenMP_${LANG}_VERSION_MINOR ${CMAKE_MATCH_2})
@@ -389,7 +393,7 @@ unset(_OpenMP_MIN_VERSION)
 
 foreach(LANG IN LISTS OpenMP_FINDLIST)
   if(CMAKE_${LANG}_COMPILER_LOADED)
-    if (NOT OpenMP_${LANG}_SPEC_DATE)
+    if (NOT OpenMP_${LANG}_SPEC_DATE AND OpenMP_${LANG}_FLAGS)
       _OPENMP_GET_SPEC_DATE("${LANG}" OpenMP_${LANG}_SPEC_DATE_INTERNAL)
       set(OpenMP_${LANG}_SPEC_DATE "${OpenMP_${LANG}_SPEC_DATE_INTERNAL}" CACHE
         INTERNAL "${LANG} compiler's OpenMP specification date")

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f156b2fbfb0cc53a3b29f31942ba7e8f0d2a9184
commit f156b2fbfb0cc53a3b29f31942ba7e8f0d2a9184
Author:     Jamie Snape <jamie.snape at kitware.com>
AuthorDate: Wed Oct 4 09:47:46 2017 -0400
Commit:     Jamie Snape <jamie.snape at kitware.com>
CommitDate: Wed Oct 4 09:47:46 2017 -0400

    FindMatlab: Add support for MATLAB 2017b

diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index d287688..7d4ed6a 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -225,6 +225,7 @@ if(NOT MATLAB_ADDITIONAL_VERSIONS)
 endif()
 
 set(MATLAB_VERSIONS_MAPPING
+  "R2017b=9.3"
   "R2017a=9.2"
   "R2016b=9.1"
   "R2016a=9.0"
@@ -236,7 +237,6 @@ set(MATLAB_VERSIONS_MAPPING
   "R2013a=8.1"
   "R2012b=8.0"
   "R2012a=7.14"
-
   "R2011b=7.13"
   "R2011a=7.12"
   "R2010b=7.11"

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

Summary of changes:
 Modules/FindMatlab.cmake |    2 +-
 Modules/FindOpenMP.cmake |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake