[Cmake-commits] CMake branch, master, updated. v3.11.0-rc1-49-g3bc3762
Kitware Robot
kwrobot at kitware.com
Tue Feb 20 11:45:05 EST 2018
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 3bc3762c7c54ba0280413b3782473e078e1b00c8 (commit)
via 1fbd5f4a7eb97137df8aec9e02bf61305efd415b (commit)
via 088c1876efcc9e10eb2023d7dd748971a24de266 (commit)
via 377254b19560c536e94bfc273b91838996c35d1a (commit)
via b25b39ad76d4e0f03ff0d4b833de45fdde68b096 (commit)
via 287e7a175c8e8034cf195fff169db718a480fdbc (commit)
via 1667e244539cfef183c4d66972fbf1e8d06fbfe2 (commit)
via c01eede89474ffb1e52595138b18b080e655a46c (commit)
from 31419815aa8cd376b1cdfd1d77c0d5c4802f4ecc (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=3bc3762c7c54ba0280413b3782473e078e1b00c8
commit 3bc3762c7c54ba0280413b3782473e078e1b00c8
Merge: 1fbd5f4 c01eede
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 20 16:42:07 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Feb 20 11:42:23 2018 -0500
Merge topic 'findzlib-folder-priority'
c01eede8 FindZLIB: Search names per directory
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1769
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1fbd5f4a7eb97137df8aec9e02bf61305efd415b
commit 1fbd5f4a7eb97137df8aec9e02bf61305efd415b
Merge: 088c187 b25b39a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 20 16:41:35 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Feb 20 11:41:50 2018 -0500
Merge topic 'CheckCSourceRuns-log-run-output'
b25b39ad CheckCSourceRuns: Teach CHECK_C_SOURCE_RUNS to log run output
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1772
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=088c1876efcc9e10eb2023d7dd748971a24de266
commit 088c1876efcc9e10eb2023d7dd748971a24de266
Merge: 377254b 287e7a1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 20 16:40:23 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Feb 20 11:41:15 2018 -0500
Merge topic 'follow-up-misc-typos'
287e7a17 Maint: misc. typos
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1771
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=377254b19560c536e94bfc273b91838996c35d1a
commit 377254b19560c536e94bfc273b91838996c35d1a
Merge: 3141981 1667e24
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 20 16:39:38 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Feb 20 11:40:18 2018 -0500
Merge topic 'help_fixup'
1667e244 Help: Fix command references in CMAKE_NETRC* variable documentation
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1770
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b25b39ad76d4e0f03ff0d4b833de45fdde68b096
commit b25b39ad76d4e0f03ff0d4b833de45fdde68b096
Author: Edward Z. Yang <ezyang at fb.com>
AuthorDate: Thu Feb 15 23:03:51 2018 -0800
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 16 09:51:26 2018 -0500
CheckCSourceRuns: Teach CHECK_C_SOURCE_RUNS to log run output
Signed-off-by: Edward Z. Yang <ezyang at fb.com>
Fixes: #17745
diff --git a/Modules/CheckCSourceRuns.cmake b/Modules/CheckCSourceRuns.cmake
index fa51346..7eb050c 100644
--- a/Modules/CheckCSourceRuns.cmake
+++ b/Modules/CheckCSourceRuns.cmake
@@ -92,7 +92,8 @@ macro(CHECK_C_SOURCE_RUNS SOURCE VAR)
CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
-DCMAKE_SKIP_RPATH:BOOL=${CMAKE_SKIP_RPATH}
"${CHECK_C_SOURCE_COMPILES_ADD_INCLUDES}"
- COMPILE_OUTPUT_VARIABLE OUTPUT)
+ COMPILE_OUTPUT_VARIABLE OUTPUT
+ RUN_OUTPUT_VARIABLE RUN_OUTPUT)
# if it did not compile make the return value fail code of 1
if(NOT ${VAR}_COMPILED)
set(${VAR}_EXITCODE 1)
@@ -104,8 +105,10 @@ macro(CHECK_C_SOURCE_RUNS SOURCE VAR)
message(STATUS "Performing Test ${VAR} - Success")
endif()
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
- "Performing C SOURCE FILE Test ${VAR} succeeded with the following output:\n"
+ "Performing C SOURCE FILE Test ${VAR} succeeded with the following compile output:\n"
"${OUTPUT}\n"
+ "...and run output:\n"
+ "${RUN_OUTPUT}\n"
"Return value: ${${VAR}}\n"
"Source file was:\n${SOURCE}\n")
else()
@@ -119,8 +122,10 @@ macro(CHECK_C_SOURCE_RUNS SOURCE VAR)
message(STATUS "Performing Test ${VAR} - Failed")
endif()
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
- "Performing C SOURCE FILE Test ${VAR} failed with the following output:\n"
+ "Performing C SOURCE FILE Test ${VAR} failed with the following compile output:\n"
"${OUTPUT}\n"
+ "...and run output:\n"
+ "${RUN_OUTPUT}\n"
"Return value: ${${VAR}_EXITCODE}\n"
"Source file was:\n${SOURCE}\n")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=287e7a175c8e8034cf195fff169db718a480fdbc
commit 287e7a175c8e8034cf195fff169db718a480fdbc
Author: luz.paz <luzpaz at users.noreply.github.com>
AuthorDate: Thu Feb 15 22:02:13 2018 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 16 09:47:17 2018 -0500
Maint: misc. typos
Found via `codespell`
diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst
index cd509ac..41fe90c 100644
--- a/Help/manual/cmake-developer.7.rst
+++ b/Help/manual/cmake-developer.7.rst
@@ -943,7 +943,7 @@ populated:
endif()
The ``RELEASE`` variant should be listed first in the property
-so that that variant is chosen if the user uses a configuration which is
+so that the variant is chosen if the user uses a configuration which is
not an exact match for any listed ``IMPORTED_CONFIGURATIONS``.
Most of the cache variables should be hidden in the ``ccmake`` interface unless
diff --git a/Modules/CMakeTestCSharpCompiler.cmake b/Modules/CMakeTestCSharpCompiler.cmake
index f3b95fd..6715c30 100644
--- a/Modules/CMakeTestCSharpCompiler.cmake
+++ b/Modules/CMakeTestCSharpCompiler.cmake
@@ -15,7 +15,7 @@ unset(CMAKE_CSharp_COMPILER_WORKS CACHE)
set(test_compile_file "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCSharpCompiler.cs")
# This file is used by EnableLanguage in cmGlobalGenerator to
-# determine that that selected C# compiler can actually compile
+# determine that the selected C# compiler can actually compile
# and link the most basic of programs. If not, a fatal error
# is set and cmake stops processing commands and will not generate
# any makefiles or projects.
diff --git a/Modules/CMakeTestCUDACompiler.cmake b/Modules/CMakeTestCUDACompiler.cmake
index df5ec72..f0454da 100644
--- a/Modules/CMakeTestCUDACompiler.cmake
+++ b/Modules/CMakeTestCUDACompiler.cmake
@@ -15,7 +15,7 @@ include(CMakeTestCompilerCommon)
unset(CMAKE_CUDA_COMPILER_WORKS CACHE)
# This file is used by EnableLanguage in cmGlobalGenerator to
-# determine that that selected cuda compiler can actually compile
+# determine that the selected cuda compiler can actually compile
# and link the most basic of programs. If not, a fatal error
# is set and cmake stops processing commands and will not generate
# any makefiles or projects.
diff --git a/Modules/CMakeTestCXXCompiler.cmake b/Modules/CMakeTestCXXCompiler.cmake
index 7b80dc0..e4d49ae 100644
--- a/Modules/CMakeTestCXXCompiler.cmake
+++ b/Modules/CMakeTestCXXCompiler.cmake
@@ -16,7 +16,7 @@ include(CMakeTestCompilerCommon)
unset(CMAKE_CXX_COMPILER_WORKS CACHE)
# This file is used by EnableLanguage in cmGlobalGenerator to
-# determine that that selected C++ compiler can actually compile
+# determine that the selected C++ compiler can actually compile
# and link the most basic of programs. If not, a fatal error
# is set and cmake stops processing commands and will not generate
# any makefiles or projects.
diff --git a/Modules/CMakeTestFortranCompiler.cmake b/Modules/CMakeTestFortranCompiler.cmake
index 3c150a8..e9860e9 100644
--- a/Modules/CMakeTestFortranCompiler.cmake
+++ b/Modules/CMakeTestFortranCompiler.cmake
@@ -16,7 +16,7 @@ include(CMakeTestCompilerCommon)
unset(CMAKE_Fortran_COMPILER_WORKS CACHE)
# This file is used by EnableLanguage in cmGlobalGenerator to
-# determine that that selected Fortran compiler can actually compile
+# determine that the selected Fortran compiler can actually compile
# and link the most basic of programs. If not, a fatal error
# is set and cmake stops processing commands and will not generate
# any makefiles or projects.
diff --git a/Modules/CMakeTestJavaCompiler.cmake b/Modules/CMakeTestJavaCompiler.cmake
index 23fdbdc..3c33573 100644
--- a/Modules/CMakeTestJavaCompiler.cmake
+++ b/Modules/CMakeTestJavaCompiler.cmake
@@ -3,7 +3,7 @@
# This file is used by EnableLanguage in cmGlobalGenerator to
-# determine that that selected Fortran compiler can actually compile
+# determine that the selected Fortran compiler can actually compile
# and link the most basic of programs. If not, a fatal error
# is set and cmake stops processing commands and will not generate
# any makefiles or projects.
diff --git a/Modules/CMakeTestRCCompiler.cmake b/Modules/CMakeTestRCCompiler.cmake
index c510d3a..3123a6c 100644
--- a/Modules/CMakeTestRCCompiler.cmake
+++ b/Modules/CMakeTestRCCompiler.cmake
@@ -3,7 +3,7 @@
# This file is used by EnableLanguage in cmGlobalGenerator to
-# determine that that selected RC compiler can actually compile
+# determine that the selected RC compiler can actually compile
# and link the most basic of programs. If not, a fatal error
# is set and cmake stops processing commands and will not generate
# any makefiles or projects.
diff --git a/Modules/CMakeTestSwiftCompiler.cmake b/Modules/CMakeTestSwiftCompiler.cmake
index bcd5c33..858c1be 100644
--- a/Modules/CMakeTestSwiftCompiler.cmake
+++ b/Modules/CMakeTestSwiftCompiler.cmake
@@ -16,7 +16,7 @@ include(CMakeTestCompilerCommon)
unset(CMAKE_Swift_COMPILER_WORKS CACHE)
# This file is used by EnableLanguage in cmGlobalGenerator to
-# determine that that selected C++ compiler can actually compile
+# determine that the selected C++ compiler can actually compile
# and link the most basic of programs. If not, a fatal error
# is set and cmake stops processing commands and will not generate
# any makefiles or projects.
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index bb5181f..258922c 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -1984,7 +1984,7 @@ function(cpack_rpm_generate_package)
endif()
if(DEFINED CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER})
- # Prefix can be replaced by Prefixes but the old version stil works so we'll ignore it for now
+ # Prefix can be replaced by Prefixes but the old version still works so we'll ignore it for now
# Requires* is a special case because it gets transformed to Requires(pre/post/preun/postun)
# Auto* is a special case because the tags can not be queried by querytags rpmbuild flag
set(special_case_tags_ PREFIX REQUIRES_PRE REQUIRES_POST REQUIRES_PREUN REQUIRES_POSTUN AUTOPROV AUTOREQ AUTOREQPROV)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1667e244539cfef183c4d66972fbf1e8d06fbfe2
commit 1667e244539cfef183c4d66972fbf1e8d06fbfe2
Author: Shane Parris <shane.lee.parris at gmail.com>
AuthorDate: Thu Feb 15 16:52:01 2018 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 16 09:41:03 2018 -0500
Help: Fix command references in CMAKE_NETRC* variable documentation
diff --git a/Help/variable/CMAKE_NETRC.rst b/Help/variable/CMAKE_NETRC.rst
index 52f857e..903ec31 100644
--- a/Help/variable/CMAKE_NETRC.rst
+++ b/Help/variable/CMAKE_NETRC.rst
@@ -2,7 +2,7 @@ CMAKE_NETRC
-----------
This variable is used to initialize the ``NETRC`` option for
-:command:`file(DOWNLOAD)` and :command:`file(DOWNLOAD)` commands and the
+:command:`file(DOWNLOAD)` and :command:`file(UPLOAD)` commands and the
module :module:`ExternalProject`. See those commands for additional
information.
diff --git a/Help/variable/CMAKE_NETRC_FILE.rst b/Help/variable/CMAKE_NETRC_FILE.rst
index 1508f1e..0f09afe 100644
--- a/Help/variable/CMAKE_NETRC_FILE.rst
+++ b/Help/variable/CMAKE_NETRC_FILE.rst
@@ -2,7 +2,7 @@ CMAKE_NETRC_FILE
----------------
This variable is used to initialize the ``NETRC_FILE`` option for
-:command:`file(DOWNLOAD)` and :command:`file(DOWNLOAD)` commands and the
+:command:`file(DOWNLOAD)` and :command:`file(UPLOAD)` commands and the
module :module:`ExternalProject`. See those commands for additional
information.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c01eede89474ffb1e52595138b18b080e655a46c
commit c01eede89474ffb1e52595138b18b080e655a46c
Author: Stefan Hacker <mail at hacst.net>
AuthorDate: Thu Feb 15 20:48:50 2018 +0100
Commit: Stefan Hacker <mail at hacst.net>
CommitDate: Thu Feb 15 21:38:48 2018 +0100
FindZLIB: Search names per directory
FindZLIB accepts various names for zlib (e.g. "z", "zlib", ...) in
various search locations. Before this patch zlib ignored the priority
implied by the search locations and instead prioritized based on the
library name. Consequently ensuring the pick of a zlib from e.g. a
CMAKE_PREFIX_PATH was not possible if it didn't have the highest
priority name ("z").
This unexpected behavior led to bugs in third party projects (e.g.
https://github.com/Microsoft/vcpkg/issues/1939). A common way to
encounter the issue in the wild is on Windows with the popular
Anaconda python distribution which puts a "z.lib" in a lib/
subdirectory reachable from a bin/ path in PATH. From then on cmake
will always pick up this library instead of the one intended by the
user.
This patch adds the NAMES_PER_DIR option to the find_library calls made
by FindZLIB making it search each directory for all names before
considering lower priority directory names resolving these issues.
diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake
index 4065999..a5c04ac 100644
--- a/Modules/FindZLIB.cmake
+++ b/Modules/FindZLIB.cmake
@@ -75,8 +75,8 @@ endforeach()
# Allow ZLIB_LIBRARY to be set manually, as the location of the zlib library
if(NOT ZLIB_LIBRARY)
foreach(search ${_ZLIB_SEARCHES})
- find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib)
- find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} ${${search}} PATH_SUFFIXES lib)
+ find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib)
+ find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib)
endforeach()
include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-developer.7.rst | 2 +-
Help/variable/CMAKE_NETRC.rst | 2 +-
Help/variable/CMAKE_NETRC_FILE.rst | 2 +-
Modules/CMakeTestCSharpCompiler.cmake | 2 +-
Modules/CMakeTestCUDACompiler.cmake | 2 +-
Modules/CMakeTestCXXCompiler.cmake | 2 +-
Modules/CMakeTestFortranCompiler.cmake | 2 +-
Modules/CMakeTestJavaCompiler.cmake | 2 +-
Modules/CMakeTestRCCompiler.cmake | 2 +-
Modules/CMakeTestSwiftCompiler.cmake | 2 +-
Modules/CPackRPM.cmake | 2 +-
Modules/CheckCSourceRuns.cmake | 11 ++++++++---
Modules/FindZLIB.cmake | 4 ++--
13 files changed, 21 insertions(+), 16 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list