[Cmake-commits] CMake branch, master, updated. v3.10.0-rc5-339-gc1930ca
Kitware Robot
kwrobot at kitware.com
Thu Nov 16 10:55:08 EST 2017
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 c1930caffe827b937d05dca9ffb82ba0b0b20eb2 (commit)
via b9ef87431b8507f6085ac77acb8bf5a7d554be45 (commit)
via ee5867287ad4d71d6318294a51eb9eed1b2cde21 (commit)
via 5b34fb20215b0b925357b98c9ae77b04ef7b2816 (commit)
via 8f9301ba255a75956eb80942686808e8f4b114ce (commit)
via e24d2b58b4009b023c54f7ec21018d1873e14f47 (commit)
via 2392f6ea3e3fc4d541594ea7e86be2bb607ba876 (commit)
via 3bc21a70b5c026d2dfe400ea3180f33bbaf529ea (commit)
via 47c2baf06a7c1435f3094c07aa90cc374e2a19c3 (commit)
via ff3c11eeaca1073664c810dd9e5f88ce38cc78c7 (commit)
via aadc38c7fd46827dbd8864e0061c9cf2d16124fe (commit)
via 9f1916aaaae830cdaa7dbfea5035f62fbc7920e7 (commit)
via 1615cdedf5ed1566c9fcc887a4c20ebba6945bf8 (commit)
via 98314d536e23168333bce28703668683192d7bd2 (commit)
via 501b08ea6760c7b5169e65ab906ee3fdc80504b0 (commit)
from bd863785dbc210f97ffecd7c4fcf65b526d4e52d (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=c1930caffe827b937d05dca9ffb82ba0b0b20eb2
commit c1930caffe827b937d05dca9ffb82ba0b0b20eb2
Merge: b9ef874 47c2baf
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 16 10:53:11 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 16 10:53:11 2017 -0500
Merge branch 'release-3.10'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b9ef87431b8507f6085ac77acb8bf5a7d554be45
commit b9ef87431b8507f6085ac77acb8bf5a7d554be45
Merge: ee58672 9f1916a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 16 15:52:21 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Nov 16 10:52:23 2017 -0500
Merge topic 'FindMatlab-better-host-detect'
9f1916aa FindMatlab: Avoid if() auto-dereference in 64-bit host detection
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1482
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee5867287ad4d71d6318294a51eb9eed1b2cde21
commit ee5867287ad4d71d6318294a51eb9eed1b2cde21
Merge: 5b34fb2 98314d5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 16 15:51:18 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Nov 16 10:51:20 2017 -0500
Merge topic 'fomp-no-def-path'
98314d53 FindOpenMP: Use NO_DEFAULT_PATH where appropriate
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1481
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b34fb20215b0b925357b98c9ae77b04ef7b2816
commit 5b34fb20215b0b925357b98c9ae77b04ef7b2816
Merge: 8f9301b 1615cde
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 16 15:50:36 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Nov 16 10:50:39 2017 -0500
Merge topic 'fmpi-command-not-found'
1615cded FindMPI: Treat 'command not found' as an error
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1483
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f9301ba255a75956eb80942686808e8f4b114ce
commit 8f9301ba255a75956eb80942686808e8f4b114ce
Merge: e24d2b5 3bc21a7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 16 15:49:57 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Nov 16 10:50:01 2017 -0500
Merge topic 'msvc-version'
3bc21a70 MSVC: Fix MSVC_VERSION when mixing MSVC C/C++ with Intel Fortran
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1488
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e24d2b58b4009b023c54f7ec21018d1873e14f47
commit e24d2b58b4009b023c54f7ec21018d1873e14f47
Merge: 2392f6e 501b08e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 16 15:49:03 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Nov 16 10:49:06 2017 -0500
Merge topic 'test-FindPatch-windows'
501b08ea Tests: Fix FindPatch test on Windows
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1480
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2392f6ea3e3fc4d541594ea7e86be2bb607ba876
commit 2392f6ea3e3fc4d541594ea7e86be2bb607ba876
Merge: bd86378 ff3c11e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 16 15:48:00 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Nov 16 10:48:10 2017 -0500
Merge topic 'FindOpenGL-glvnd-preference'
ff3c11ee FindOpenGL: Add option to prefer GLVND for legacy GL
aadc38c7 FindOpenGL: Re-order component library searches
Acked-by: Kitware Robot <kwrobot at kitware.com>
Acked-by: Clinton Stimpson <clinton at elemtech.com>
Merge-request: !1485
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3bc21a70b5c026d2dfe400ea3180f33bbaf529ea
commit 3bc21a70b5c026d2dfe400ea3180f33bbaf529ea
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 15 14:44:02 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 15 14:58:44 2017 -0500
MSVC: Fix MSVC_VERSION when mixing MSVC C/C++ with Intel Fortran
When using a real MSVC compiler for `C` or `CXX`, use the version of
that compiler for `MSVC_VERSION`. This is preferred over the MSVC
version that a non-MSVC compiler "simulates".
Fixes: #17468
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 4719563..0737c12 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -48,7 +48,11 @@ else()
endif()
if(NOT MSVC_VERSION)
- if(CMAKE_C_SIMULATE_VERSION)
+ if("x${CMAKE_C_COMPILER_ID}" STREQUAL "xMSVC")
+ set(_compiler_version ${CMAKE_C_COMPILER_VERSION})
+ elseif("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
+ set(_compiler_version ${CMAKE_CXX_COMPILER_VERSION})
+ elseif(CMAKE_C_SIMULATE_VERSION)
set(_compiler_version ${CMAKE_C_SIMULATE_VERSION})
elseif(CMAKE_CXX_SIMULATE_VERSION)
set(_compiler_version ${CMAKE_CXX_SIMULATE_VERSION})
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f1916aaaae830cdaa7dbfea5035f62fbc7920e7
commit 9f1916aaaae830cdaa7dbfea5035f62fbc7920e7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 15 09:31:04 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 15 09:33:56 2017 -0500
FindMatlab: Avoid if() auto-dereference in 64-bit host detection
If the value of `CMAKE_HOST_SYSTEM_PROCESSOR` also happens to be set as
a variable by a project (e.g. `AMD64`), allowing `if()` to
auto-dereference is unlikely to produce a value that matches "64".
Instead let `if()` auto-dereference `CMAKE_HOST_SYSTEM_PROCESSOR`.
Fixes: #17460
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index c79642d..06f7d96 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -356,7 +356,7 @@ function(matlab_extract_all_installed_versions_from_registry win64 matlab_versio
endif()
- if(${win64} AND ${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "64")
+ if(${win64} AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "64")
set(APPEND_REG "/reg:64")
else()
set(APPEND_REG "/reg:32")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1615cdedf5ed1566c9fcc887a4c20ebba6945bf8
commit 1615cdedf5ed1566c9fcc887a4c20ebba6945bf8
Author: Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Wed Nov 15 15:27:35 2017 +0100
Commit: Christian Pfeiffer <cpfeiffer at live.de>
CommitDate: Wed Nov 15 15:27:35 2017 +0100
FindMPI: Treat 'command not found' as an error
If the compiler given in I_MPI_... could not be found, the Intel MPI
wrappers emit an error like "line 590: ifort: command not found".
The script should currently fail to match the output of this for
information, but we should generally treat such an output as invalid,
since the displayed configuration line can become a mixup between Intel
and GNU compiler settings.
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 7f4c44c..3320a07 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -346,7 +346,7 @@ function (_MPI_check_compiler LANG QUERY_FLAG OUTPUT_VARIABLE RESULT_VARIABLE)
# library that has invalid or missing version information there would be warning
# messages emitted by ld.so in the compiler output. In either case, we'll treat
# the output as invalid.
- if("${WRAPPER_OUTPUT}" MATCHES "undefined reference|unrecognized|need to set|no version information available")
+ if("${WRAPPER_OUTPUT}" MATCHES "undefined reference|unrecognized|need to set|no version information available|command not found")
set(WRAPPER_RETURN 255)
endif()
# Ensure that no error output might be passed upwards.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98314d536e23168333bce28703668683192d7bd2
commit 98314d536e23168333bce28703668683192d7bd2
Author: Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Wed Nov 15 15:05:41 2017 +0100
Commit: Christian Pfeiffer <cpfeiffer at live.de>
CommitDate: Wed Nov 15 15:05:41 2017 +0100
FindOpenMP: Use NO_DEFAULT_PATH where appropriate
OpenMP libraries must always be found in the implicit linking
directories of a compiler when using the OpenMP compile flag. If a suitable OpenMP library is also found in for example some CMAKE_PREFIX_PATH, this can lead to the module finding the incorrect library.
On the other hand, CMAKE_PREFIX_PATH can't ever be a location that we
need to consider since the OpenMP compile flag would not work if we
needed to.
diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake
index 489476b..a6eba6e 100644
--- a/Modules/FindOpenMP.cmake
+++ b/Modules/FindOpenMP.cmake
@@ -230,6 +230,7 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_VAR OPENMP_LIB_NAMES_VAR)
DOC "Path to the ${_OPENMP_IMPLICIT_LIB_PLAIN} library for OpenMP"
HINTS ${OpenMP_${LANG}_IMPLICIT_LINK_DIRS}
CMAKE_FIND_ROOT_PATH_BOTH
+ NO_DEFAULT_PATH
)
endif()
mark_as_advanced(OpenMP_${_OPENMP_IMPLICIT_LIB_PLAIN}_LIBRARY)
@@ -244,6 +245,8 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_VAR OPENMP_LIB_NAMES_VAR)
find_library(OpenMP_libiomp5md_LIBRARY
NAMES "libiomp5md"
HINTS ${CMAKE_${LANG}_IMPLICIT_LINK_DIRECTORIES}
+ CMAKE_FIND_ROOT_PATH_BOTH
+ NO_DEFAULT_PATH
)
mark_as_advanced(OpenMP_libiomp5md_LIBRARY)
else()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=501b08ea6760c7b5169e65ab906ee3fdc80504b0
commit 501b08ea6760c7b5169e65ab906ee3fdc80504b0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 15 06:56:04 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 15 06:56:04 2017 -0500
Tests: Fix FindPatch test on Windows
On Windows our input and patch files may have CRLF newlines.
Tell `patch` not to transform them to LF newlines because our
baseline will have CRLF newlines too.
diff --git a/Tests/FindPatch/Test/CMakeLists.txt b/Tests/FindPatch/Test/CMakeLists.txt
index f4cd621..66c672c 100644
--- a/Tests/FindPatch/Test/CMakeLists.txt
+++ b/Tests/FindPatch/Test/CMakeLists.txt
@@ -70,8 +70,8 @@ index 68059b3..c6f30c2 100644
)
add_custom_target(TestPatch ALL
- COMMAND ${Patch_EXECUTABLE} -p1 -i quote-add-author.patch
- COMMAND Patch::patch -p1 -i quote-add-date.patch
+ COMMAND ${Patch_EXECUTABLE} -p1 -i quote-add-author.patch --binary
+ COMMAND Patch::patch -p1 -i quote-add-date.patch --binary
COMMAND ${CMAKE_COMMAND} -E compare_files QUOTE.txt QUOTE.txt.baseline
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindMPI.cmake | 2 +-
Modules/FindMatlab.cmake | 2 +-
Modules/FindOpenGL.cmake | 70 ++++++++++++++++++++++++++++-------
Modules/FindOpenMP.cmake | 3 ++
Modules/Platform/Windows-MSVC.cmake | 6 ++-
Tests/FindPatch/Test/CMakeLists.txt | 4 +-
6 files changed, 69 insertions(+), 18 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list