[Cmake-commits] CMake branch, master, updated. v3.13.0-rc1-62-g3499c91

[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  3499c91a1bf5eadb62c099eaefdf6a9a2f8f90a4 (commit)
       via  32fdbd57a86e5d350d72de3ebdb60e6ea20de717 (commit)
       via  e92cc2978524a32f65bdb645eec52f353dab987b (commit)
       via  7772bd31f57fd8b4d6a7937a97671eb34c966835 (commit)
      from  5dd16bc92cd565cda4060879e1e27baac3a78baf (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=3499c91a1bf5eadb62c099eaefdf6a9a2f8f90a4
commit 3499c91a1bf5eadb62c099eaefdf6a9a2f8f90a4
Merge: e92cc29 32fdbd5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 10 10:00:16 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 10 10:00:16 2018 -0400

    Merge branch 'release-3.12'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32fdbd57a86e5d350d72de3ebdb60e6ea20de717
commit 32fdbd57a86e5d350d72de3ebdb60e6ea20de717
Merge: 05d3411 7772bd3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 10 09:59:47 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 10 09:59:47 2018 -0400

    Merge branch 'backport-FindMatlab-missing-install' into release-3.12
    
    Merge-request: !2471


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e92cc2978524a32f65bdb645eec52f353dab987b
commit e92cc2978524a32f65bdb645eec52f353dab987b
Merge: 5dd16bc 7772bd3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 10 13:59:03 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Oct 10 09:59:09 2018 -0400

    Merge topic 'backport-FindMatlab-missing-install'
    
    7772bd31f5 FindMatlab: Guard against nonexistent installation
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2471


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7772bd31f57fd8b4d6a7937a97671eb34c966835
commit 7772bd31f57fd8b4d6a7937a97671eb34c966835
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Mon Aug 27 14:57:17 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 10 09:53:58 2018 -0400

    FindMatlab: Guard against nonexistent installation
    
    Logic added by commit v3.12.0-rc1~183^2 (FindMatlab: Matlab Runtime
    Compiler support, 2017-04-29) assumes that `VersionInfo.xml` exists
    in the installation.  Fix it to tolerate a missing or empty file.
    
    This change was originally made by commit v3.13.0-rc1~173^2 (FindMatlab:
    Guard against nonexistent installation, 2018-08-27).  Here we backport
    it to the 3.12.x series.
    
    Fixes: #18436

diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 2d04b84..d765bdf 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -1163,21 +1163,24 @@ function(_Matlab_get_version_from_root matlab_root matlab_or_mcr matlab_known_ve
 
     # return the updated value
     set(${matlab_final_version} ${Matlab_VERSION_STRING_INTERNAL} PARENT_SCOPE)
-  else()
+  elseif(EXISTS "${matlab_root}/VersionInfo.xml")
     # MCR
     # we cannot run anything in order to extract the version. We assume that the file
     # VersionInfo.xml exists under the MatlabRoot, we look for it and extract the version from there
     set(_matlab_version_tmp "unknown")
     file(STRINGS "${matlab_root}/VersionInfo.xml" versioninfo_string NEWLINE_CONSUME)
-    # parses "<version>9.2.0.538062</version>"
-    string(REGEX MATCH "<version>(.*)</version>"
-           version_reg_match
-           ${versioninfo_string}
-          )
-
-    if(NOT "${version_reg_match}" STREQUAL "")
-      if("${CMAKE_MATCH_1}" MATCHES "(([0-9])\\.([0-9]))[\\.0-9]*")
-        set(_matlab_version_tmp "${CMAKE_MATCH_1}")
+
+    if(versioninfo_string)
+      # parses "<version>9.2.0.538062</version>"
+      string(REGEX MATCH "<version>(.*)</version>"
+             version_reg_match
+             ${versioninfo_string}
+            )
+
+      if(NOT "${version_reg_match}" STREQUAL "")
+        if("${CMAKE_MATCH_1}" MATCHES "(([0-9])\\.([0-9]))[\\.0-9]*")
+          set(_matlab_version_tmp "${CMAKE_MATCH_1}")
+        endif()
       endif()
     endif()
     set(${matlab_final_version} "${_matlab_version_tmp}" PARENT_SCOPE)
@@ -1185,8 +1188,7 @@ function(_Matlab_get_version_from_root matlab_root matlab_or_mcr matlab_known_ve
         "${_matlab_version_tmp}"
         CACHE INTERNAL "Matlab (MCR) version (automatically determined)"
         FORCE)
-
-    endif() # Matlab or MCR
+  endif() # Matlab or MCR
 
 endfunction()
 

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

Summary of changes:


hooks/post-receive
-- 
CMake