[Cmake-commits] CMake branch, master, updated. v3.13.3-1123-g6d57201

[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  6d572018687cc2b398f59519e87f17c68836b267 (commit)
       via  f411e936be6c5d0070c67aeb3baea150a01024a1 (commit)
       via  fc40bca5902e6c29197696438211265e22efa84f (commit)
       via  08dee696b5831a8cba0a70df5e6b072f91d0c6f8 (commit)
      from  f832f15509ae269d236c0c7a5e06808b78fdaba2 (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=6d572018687cc2b398f59519e87f17c68836b267
commit 6d572018687cc2b398f59519e87f17c68836b267
Merge: f411e93 fc40bca
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 28 12:59:11 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jan 28 07:59:30 2019 -0500

    Merge topic 'intel-compile-features'
    
    fc40bca590 Intel: Record support for relaxed constexpr by version 18.0.5
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2862


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f411e936be6c5d0070c67aeb3baea150a01024a1
commit f411e936be6c5d0070c67aeb3baea150a01024a1
Merge: f832f15 08dee69
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 28 12:58:36 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jan 28 07:58:45 2019 -0500

    Merge topic 'FindPythonInterp-version-fix'
    
    08dee696b5 FindPythonInterp: Do not assume any version if test script fails
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2835


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc40bca5902e6c29197696438211265e22efa84f
commit fc40bca5902e6c29197696438211265e22efa84f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 25 07:37:20 2019 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 25 07:56:37 2019 -0500

    Intel: Record support for relaxed constexpr by version 18.0.5
    
    Update the special case added by commit f719a13c28 (Features: Add
    special case to disable relaxed constexpr for Intel 18, 2018-06-04,
    v3.12.0-rc1~11^2) to record that 18.0.5 fixed the regression.

diff --git a/Modules/Compiler/Intel-CXX-FeatureTests.cmake b/Modules/Compiler/Intel-CXX-FeatureTests.cmake
index 0df6c0f..aa35b97 100644
--- a/Modules/Compiler/Intel-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/Intel-CXX-FeatureTests.cmake
@@ -24,7 +24,7 @@ set(DETECT_CXX14 "((__cplusplus >= 201300L) || ((__cplusplus == 201103L) && !def
 unset(DETECT_BUGGY_ICC15)
 
 set(Intel17_CXX14 "__INTEL_COMPILER >= 1700 && ${DETECT_CXX14}")
-set(_cmake_feature_test_cxx_relaxed_constexpr "__cpp_constexpr >= 201304 || (${Intel17_CXX14} && __INTEL_COMPILER != 1800 && !defined(_MSC_VER))")
+set(_cmake_feature_test_cxx_relaxed_constexpr "__cpp_constexpr >= 201304 || (${Intel17_CXX14} && !(__INTEL_COMPILER == 1800 && __INTEL_COMPILER_UPDATE < 5) && !defined(_MSC_VER))")
 
 set(Intel16_CXX14 "__INTEL_COMPILER >= 1600 && ${DETECT_CXX14}")
 set(_cmake_feature_test_cxx_aggregate_default_initializers "${Intel16_CXX14}")

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08dee696b5831a8cba0a70df5e6b072f91d0c6f8
commit 08dee696b5831a8cba0a70df5e6b072f91d0c6f8
Author:     Marc Chevrier <marc.chevrier at gmail.com>
AuthorDate: Mon Jan 21 16:41:59 2019 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 22 10:43:08 2019 -0500

    FindPythonInterp: Do not assume any version if test script fails
    
    The Python version is retrieved by executing a small python script. If,
    for any reason, script fails to execute, leave the `PYTHON_VERSION_*`
    variables undefined instead of assuming version 1.4.
    
    Fixes: #18799

diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
index d1f7b31..da33301 100644
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@ -130,7 +130,9 @@ if(PYTHON_EXECUTABLE)
         endif()
     else()
         # sys.version predates sys.version_info, so use that
-        execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write(sys.version)"
+        # sys.version was first documented for Python 1.5, so assume version 1.4
+        # if retrieving sys.version fails.
+        execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "try: import sys; sys.stdout.write(sys.version)\nexcept: sys.stdout.write(\"1.4.0\")"
                         OUTPUT_VARIABLE _VERSION
                         RESULT_VARIABLE _PYTHON_VERSION_RESULT
                         ERROR_QUIET)
@@ -144,12 +146,10 @@ if(PYTHON_EXECUTABLE)
                 set(PYTHON_VERSION_PATCH "0")
             endif()
         else()
-            # sys.version was first documented for Python 1.5, so assume
-            # this is older.
-            set(PYTHON_VERSION_STRING "1.4")
-            set(PYTHON_VERSION_MAJOR "1")
-            set(PYTHON_VERSION_MINOR "4")
-            set(PYTHON_VERSION_PATCH "0")
+            unset(PYTHON_VERSION_STRING)
+            unset(PYTHON_VERSION_MAJOR)
+            unset(PYTHON_VERSION_MINOR)
+            unset(PYTHON_VERSION_PATCH)
         endif()
     endif()
     unset(_PYTHON_VERSION_RESULT)

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

Summary of changes:
 Modules/Compiler/Intel-CXX-FeatureTests.cmake |  2 +-
 Modules/FindPythonInterp.cmake                | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake