[Cmake-commits] CMake branch, master, updated. v3.13.1-671-g45c5958
Kitware Robot
kwrobot at kitware.com
Mon Dec 10 08:23:06 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 45c5958e36cf55b00338b3f69cd48f43c51a03e0 (commit)
via 0bfe96a8c35aae2744efad664444ac5a963d74d3 (commit)
via e1db7aac307e85154c1abd91afbdf61b65780caf (commit)
via d99e1cca20a58abce5c300dbfef98e1180e3c7bf (commit)
via 5f3b067bee1b30b6d74ef48f31e9e2bbb27cd27a (commit)
via 0f9533e61b775255cf380c97c72dea1c7845e56b (commit)
via 3b4e86f26dddbdfd2cd172274ae7c1340f1eba29 (commit)
via 0becea2d6061e8fa49c5f6a00757efacdd93421a (commit)
via e5a4007a3b4aefeb3d814adb75835adc6111e238 (commit)
via 4be7f38d57bdf94a600edace627be8e14f331250 (commit)
via 187481d4d988f45e05f2f7a6e89df89cd64ecfe9 (commit)
via 4a3ae1710ecefedef8c345cd00599b335bc164d2 (commit)
via 31840e363f61c10770a3d22467396c05e7d3d422 (commit)
via 98a39be6cfb7b229ff78f7045c6d5bcd6b6c7509 (commit)
from 4b513c0ca31d5a90b283b794397e40168070e400 (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=45c5958e36cf55b00338b3f69cd48f43c51a03e0
commit 45c5958e36cf55b00338b3f69cd48f43c51a03e0
Merge: 0bfe96a 0f9533e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 10 13:21:59 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Dec 10 08:22:20 2018 -0500
Merge topic 'cuda-arch-turing'
0f9533e61b CUDA: Add CUDA 10 (Turing) detection
Acked-by: Kitware Robot <kwrobot at kitware.com>
Reviewed-by: Henry Schreiner <henryschreineriii at gmail.com>
Merge-request: !2702
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bfe96a8c35aae2744efad664444ac5a963d74d3
commit 0bfe96a8c35aae2744efad664444ac5a963d74d3
Merge: e1db7aa 31840e3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 10 13:21:33 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Dec 10 08:21:40 2018 -0500
Merge topic 'file-read_symlink'
31840e363f file: Fix formatting of error in SIZE sub-command
98a39be6cf file: Add READ_SYMLINK sub-command
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2705
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1db7aac307e85154c1abd91afbdf61b65780caf
commit e1db7aac307e85154c1abd91afbdf61b65780caf
Merge: d99e1cc 3b4e86f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 10 08:20:10 2018 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 10 08:20:10 2018 -0500
Merge branch 'release-3.13'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d99e1cca20a58abce5c300dbfef98e1180e3c7bf
commit d99e1cca20a58abce5c300dbfef98e1180e3c7bf
Merge: 5f3b067 4a3ae17
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 10 13:16:29 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Dec 10 08:17:06 2018 -0500
Merge topic 'cpack-status-callback'
4a3ae1710e CPack/External: Fix status messages of staging scripts
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2696
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f3b067bee1b30b6d74ef48f31e9e2bbb27cd27a
commit 5f3b067bee1b30b6d74ef48f31e9e2bbb27cd27a
Merge: 4b513c0 e5a4007
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 10 13:16:12 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Dec 10 08:16:20 2018 -0500
Merge topic 'autogen_revert_implicit_includes'
e5a4007a3b Merge branch 'backport-autogen_revert_implicit_includes'
4be7f38d57 Autogen: Revert passing compiler implicit includes to moc
187481d4d9 Autogen: Revert passing compiler implicit includes to moc
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2709
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f9533e61b775255cf380c97c72dea1c7845e56b
commit 0f9533e61b775255cf380c97c72dea1c7845e56b
Author: Anton Chernov <mechernov at gmail.com>
AuthorDate: Wed Dec 5 11:37:37 2018 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 7 08:51:57 2018 -0500
CUDA: Add CUDA 10 (Turing) detection
diff --git a/Modules/FindCUDA/select_compute_arch.cmake b/Modules/FindCUDA/select_compute_arch.cmake
index 1baf051..7ddb709 100644
--- a/Modules/FindCUDA/select_compute_arch.cmake
+++ b/Modules/FindCUDA/select_compute_arch.cmake
@@ -5,9 +5,9 @@
# - "Auto" detects local machine GPU compute arch at runtime.
# - "Common" and "All" cover common and entire subsets of architectures
# ARCH_AND_PTX : NAME | NUM.NUM | NUM.NUM(NUM.NUM) | NUM.NUM+PTX
-# NAME: Fermi Kepler Maxwell Kepler+Tegra Kepler+Tesla Maxwell+Tegra Pascal
+# NAME: Fermi Kepler Maxwell Kepler+Tegra Kepler+Tesla Maxwell+Tegra Pascal Volta Turing
# NUM: Any number. Only those pairs are currently accepted by NVCC though:
-# 2.0 2.1 3.0 3.2 3.5 3.7 5.0 5.2 5.3 6.0 6.2
+# 2.0 2.1 3.0 3.2 3.5 3.7 5.0 5.2 5.3 6.0 6.2 7.0 7.2 7.5
# Returns LIST of flags to be added to CUDA_NVCC_FLAGS in ${out_variable}
# Additionally, sets ${out_variable}_readable to the resulting numeric list
# Example:
@@ -63,12 +63,23 @@ endif ()
if(CUDA_VERSION VERSION_GREATER_EQUAL "9.0")
list(APPEND CUDA_KNOWN_GPU_ARCHITECTURES "Volta")
list(APPEND CUDA_COMMON_GPU_ARCHITECTURES "7.0" "7.0+PTX")
+ list(APPEND CUDA_ALL_GPU_ARCHITECTURES "7.0" "7.0+PTX" "7.2" "7.2+PTX")
if(CUDA_VERSION VERSION_LESS "10.0")
set(CUDA_LIMIT_GPU_ARCHITECTURE "8.0")
endif()
endif()
+if(CUDA_VERSION VERSION_GREATER_EQUAL "10.0")
+ list(APPEND CUDA_KNOWN_GPU_ARCHITECTURES "Turing")
+ list(APPEND CUDA_COMMON_GPU_ARCHITECTURES "7.5" "7.5+PTX")
+ list(APPEND CUDA_ALL_GPU_ARCHITECTURES "7.5" "7.5+PTX")
+
+ if(CUDA_VERSION VERSION_LESS "11.0")
+ set(CUDA_LIMIT_GPU_ARCHITECTURE "9.0")
+ endif()
+endif()
+
################################################################################################
# A function for automatic detection of GPUs installed (if autodetection is enabled)
# Usage:
@@ -200,6 +211,9 @@ function(CUDA_SELECT_NVCC_ARCH_FLAGS out_variable)
elseif(${arch_name} STREQUAL "Volta")
set(arch_bin 7.0 7.0)
set(arch_ptx 7.0)
+ elseif(${arch_name} STREQUAL "Turing")
+ set(arch_bin 7.5)
+ set(arch_ptx 7.5)
else()
message(SEND_ERROR "Unknown CUDA Architecture Name ${arch_name} in CUDA_SELECT_NVCC_ARCH_FLAGS")
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5a4007a3b4aefeb3d814adb75835adc6111e238
commit e5a4007a3b4aefeb3d814adb75835adc6111e238
Merge: 4be7f38 187481d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 7 08:02:25 2018 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 7 08:02:25 2018 -0500
Merge branch 'backport-autogen_revert_implicit_includes'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4be7f38d57bdf94a600edace627be8e14f331250
commit 4be7f38d57bdf94a600edace627be8e14f331250
Author: Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Thu Dec 6 18:42:40 2018 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 7 08:01:02 2018 -0500
Autogen: Revert passing compiler implicit includes to moc
Passing an incomplete list of compiler include directories causes
a regression in the KIO project (and probably others). We need to
disable it until the complete list is available (see #16291).
Fixes: #18669
Issue: #18041
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx
index d4819a3..9dfd9db 100644
--- a/Source/cmQtAutoGenInitializer.cxx
+++ b/Source/cmQtAutoGenInitializer.cxx
@@ -489,10 +489,13 @@ bool cmQtAutoGenInitializer::InitMoc()
// Moc includes
{
- bool const appendImplicit = (this->QtVersion.Major == 5);
+ // We need to disable this until we have all implicit includes available.
+ // See issue #18669.
+ // bool const appendImplicit = (this->QtVersion.Major == 5);
+
auto GetIncludeDirs =
- [this, localGen,
- appendImplicit](std::string const& cfg) -> std::vector<std::string> {
+ [this, localGen](std::string const& cfg) -> std::vector<std::string> {
+ bool const appendImplicit = false;
// Get the include dirs for this target, without stripping the implicit
// include dirs off, see
// https://gitlab.kitware.com/cmake/cmake/issues/13667
diff --git a/Tests/QtAutogen/Tests.cmake b/Tests/QtAutogen/Tests.cmake
index 096d5e3..c53fb4f 100644
--- a/Tests/QtAutogen/Tests.cmake
+++ b/Tests/QtAutogen/Tests.cmake
@@ -39,7 +39,8 @@ endif()
# Qt5 only tests
if(QT_TEST_VERSION GREATER 4)
ADD_AUTOGEN_TEST(MocMacroName mocMacroName)
- ADD_AUTOGEN_TEST(MocOsMacros)
+ # Disabled for issue #18669
+ #ADD_AUTOGEN_TEST(MocOsMacros)
ADD_AUTOGEN_TEST(RerunMocPlugin)
if(APPLE)
ADD_AUTOGEN_TEST(MacOsFW)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=31840e363f61c10770a3d22467396c05e7d3d422
commit 31840e363f61c10770a3d22467396c05e7d3d422
Author: Kyle Edwards <kyle.edwards at kitware.com>
AuthorDate: Thu Dec 6 10:28:16 2018 -0500
Commit: Kyle Edwards <kyle.edwards at kitware.com>
CommitDate: Thu Dec 6 10:28:16 2018 -0500
file: Fix formatting of error in SIZE sub-command
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 7fc717d..fb8e8d3 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -3630,7 +3630,7 @@ bool cmFileCommand::HandleSizeCommand(std::vector<std::string> const& args)
if (!cmSystemTools::FileExists(filename, true)) {
std::ostringstream e;
- e << "SIZE requested of path that is not readable " << filename;
+ e << "SIZE requested of path that is not readable:\n " << filename;
this->SetError(e.str());
return false;
}
diff --git a/Tests/RunCMake/file/SIZE-error-does-not-exist-stderr.txt b/Tests/RunCMake/file/SIZE-error-does-not-exist-stderr.txt
index b797a41..842cf89 100644
--- a/Tests/RunCMake/file/SIZE-error-does-not-exist-stderr.txt
+++ b/Tests/RunCMake/file/SIZE-error-does-not-exist-stderr.txt
@@ -1,5 +1,6 @@
^CMake Error at SIZE-error-does-not-exist.cmake:[0-9]+ \(file\):
- file SIZE requested of path that is not readable
- /a/file/that/does-not-exist
+ file SIZE requested of path that is not readable:
+
+ .*/Tests/RunCMake/file/SIZE-error-does-not-exist-build/does-not-exist
Call Stack \(most recent call first\):
CMakeLists.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/file/SIZE-error-does-not-exist.cmake b/Tests/RunCMake/file/SIZE-error-does-not-exist.cmake
index edcc222..ebac737 100644
--- a/Tests/RunCMake/file/SIZE-error-does-not-exist.cmake
+++ b/Tests/RunCMake/file/SIZE-error-does-not-exist.cmake
@@ -1,3 +1,3 @@
-set(file "/a/file/that/does-not-exist")
+set(file "${CMAKE_CURRENT_BINARY_DIR}/does-not-exist")
file(SIZE "${file}" CALCULATED_SIZE)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98a39be6cfb7b229ff78f7045c6d5bcd6b6c7509
commit 98a39be6cfb7b229ff78f7045c6d5bcd6b6c7509
Author: Kyle Edwards <kyle.edwards at kitware.com>
AuthorDate: Wed Dec 5 15:27:08 2018 -0500
Commit: Kyle Edwards <kyle.edwards at kitware.com>
CommitDate: Thu Dec 6 10:11:51 2018 -0500
file: Add READ_SYMLINK sub-command
diff --git a/Help/command/file.rst b/Help/command/file.rst
index 26a9ae2..6e2a6dd 100644
--- a/Help/command/file.rst
+++ b/Help/command/file.rst
@@ -26,6 +26,7 @@ Synopsis
file(`MAKE_DIRECTORY`_ [<dir>...])
file({`COPY`_ | `INSTALL`_} <file>... DESTINATION <dir> [...])
file(`SIZE`_ <filename> <out-var>)
+ file(`READ_SYMLINK`_ <filename> <out-var>)
`Path Conversion`_
file(`RELATIVE_PATH`_ <out-var> <directory> <file>)
@@ -344,6 +345,29 @@ Determine the file size of the ``<filename>`` and put the result in
``<variable>`` variable. Requires that ``<filename>`` is a valid path
pointing to a file and is readable.
+.. _READ_SYMLINK:
+
+.. code-block:: cmake
+
+ file(READ_SYMLINK <filename> <variable>)
+
+Read the symlink at ``<filename>`` and put the result in ``<variable>``.
+Requires that ``<filename>`` is a valid path pointing to a symlink. If
+``<filename>`` does not exist, or is not a symlink, an error is thrown.
+
+Note that this command returns the raw symlink path and does not resolve
+relative symlinks. If you want to resolve the relative symlink yourself, you
+could do something like this:
+
+.. code-block:: cmake
+
+ set(filename "/path/to/foo.sym")
+ file(READ_SYMLINK "${filename}" result)
+ if(NOT IS_ABSOLUTE "${result}")
+ get_filename_component(dir "${filename}" DIRECTORY)
+ set(result "${dir}/${result}")
+ endif()
+
Path Conversion
^^^^^^^^^^^^^^^
diff --git a/Help/release/dev/file-read_symlink.rst b/Help/release/dev/file-read_symlink.rst
new file mode 100644
index 0000000..718802e
--- /dev/null
+++ b/Help/release/dev/file-read_symlink.rst
@@ -0,0 +1,5 @@
+file-read_symlink
+-----------------
+
+* The :command:`file` command learned a new sub-command, ``READ_SYMLINK``,
+ which can be used to determine the path that a symlink points to.
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 73ff5a1..7fc717d 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -180,6 +180,9 @@ bool cmFileCommand::InitialPass(std::vector<std::string> const& args,
if (subCommand == "SIZE") {
return this->HandleSizeCommand(args);
}
+ if (subCommand == "READ_SYMLINK") {
+ return this->HandleReadSymlinkCommand(args);
+ }
std::string e = "does not recognize sub-command " + subCommand;
this->SetError(e);
@@ -3638,3 +3641,30 @@ bool cmFileCommand::HandleSizeCommand(std::vector<std::string> const& args)
return true;
}
+
+bool cmFileCommand::HandleReadSymlinkCommand(
+ std::vector<std::string> const& args)
+{
+ if (args.size() != 3) {
+ std::ostringstream e;
+ e << args[0] << " requires a file name and output variable";
+ this->SetError(e.str());
+ return false;
+ }
+
+ const std::string& filename = args[1];
+ const std::string& outputVariable = args[2];
+
+ std::string result;
+ if (!cmSystemTools::ReadSymlink(filename, result)) {
+ std::ostringstream e;
+ e << "READ_SYMLINK requested of path that is not a symlink:\n "
+ << filename;
+ this->SetError(e.str());
+ return false;
+ }
+
+ this->Makefile->AddDefinition(outputVariable, result.c_str());
+
+ return true;
+}
diff --git a/Source/cmFileCommand.h b/Source/cmFileCommand.h
index 01e007d..fe05c98 100644
--- a/Source/cmFileCommand.h
+++ b/Source/cmFileCommand.h
@@ -60,6 +60,7 @@ protected:
bool HandleGenerateCommand(std::vector<std::string> const& args);
bool HandleLockCommand(std::vector<std::string> const& args);
bool HandleSizeCommand(std::vector<std::string> const& args);
+ bool HandleReadSymlinkCommand(std::vector<std::string> const& args);
private:
void AddEvaluationFile(const std::string& inputName,
diff --git a/Tests/RunCMake/file/READ_SYMLINK-noexist-result.txt b/Tests/RunCMake/file/READ_SYMLINK-noexist-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/file/READ_SYMLINK-noexist-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/file/READ_SYMLINK-noexist-stderr.txt b/Tests/RunCMake/file/READ_SYMLINK-noexist-stderr.txt
new file mode 100644
index 0000000..32b3e85
--- /dev/null
+++ b/Tests/RunCMake/file/READ_SYMLINK-noexist-stderr.txt
@@ -0,0 +1,6 @@
+^CMake Error at READ_SYMLINK-noexist\.cmake:[0-9]+ \(file\):
+ file READ_SYMLINK requested of path that is not a symlink:
+
+ .*/Tests/RunCMake/file/READ_SYMLINK-noexist-build/rel\.sym
+Call Stack \(most recent call first\):
+ CMakeLists\.txt:[0-9]+ \(include\)$
diff --git a/Tests/RunCMake/file/READ_SYMLINK-noexist.cmake b/Tests/RunCMake/file/READ_SYMLINK-noexist.cmake
new file mode 100644
index 0000000..9e57e4b
--- /dev/null
+++ b/Tests/RunCMake/file/READ_SYMLINK-noexist.cmake
@@ -0,0 +1 @@
+file(READ_SYMLINK "${CMAKE_CURRENT_BINARY_DIR}/rel.sym" result)
diff --git a/Tests/RunCMake/file/READ_SYMLINK-notsymlink-result.txt b/Tests/RunCMake/file/READ_SYMLINK-notsymlink-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/file/READ_SYMLINK-notsymlink-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/file/READ_SYMLINK-notsymlink-stderr.txt b/Tests/RunCMake/file/READ_SYMLINK-notsymlink-stderr.txt
new file mode 100644
index 0000000..63e32ed
--- /dev/null
+++ b/Tests/RunCMake/file/READ_SYMLINK-notsymlink-stderr.txt
@@ -0,0 +1,6 @@
+^CMake Error at READ_SYMLINK-notsymlink\.cmake:[0-9]+ \(file\):
+ file READ_SYMLINK requested of path that is not a symlink:
+
+ .*/Tests/RunCMake/file/READ_SYMLINK-notsymlink-build/rel\.sym
+Call Stack \(most recent call first\):
+ CMakeLists\.txt:[0-9]+ \(include\)$
diff --git a/Tests/RunCMake/file/READ_SYMLINK-notsymlink.cmake b/Tests/RunCMake/file/READ_SYMLINK-notsymlink.cmake
new file mode 100644
index 0000000..a9798b6
--- /dev/null
+++ b/Tests/RunCMake/file/READ_SYMLINK-notsymlink.cmake
@@ -0,0 +1,2 @@
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/rel.sym" "")
+file(READ_SYMLINK "${CMAKE_CURRENT_BINARY_DIR}/rel.sym" result)
diff --git a/Tests/RunCMake/file/READ_SYMLINK.cmake b/Tests/RunCMake/file/READ_SYMLINK.cmake
new file mode 100644
index 0000000..865a2e9
--- /dev/null
+++ b/Tests/RunCMake/file/READ_SYMLINK.cmake
@@ -0,0 +1,13 @@
+execute_process(COMMAND
+ ${CMAKE_COMMAND} -E create_symlink "test.txt" "${CMAKE_CURRENT_BINARY_DIR}/rel.sym")
+file(READ_SYMLINK "${CMAKE_CURRENT_BINARY_DIR}/rel.sym" result)
+if(NOT result STREQUAL "test.txt")
+ message(SEND_ERROR "Relative symlink is \"${result}\", should be \"test.txt\"")
+endif()
+
+execute_process(COMMAND
+ ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_BINARY_DIR}/test.txt" "${CMAKE_CURRENT_BINARY_DIR}/abs.sym")
+file(READ_SYMLINK "${CMAKE_CURRENT_BINARY_DIR}/abs.sym" result)
+if(NOT result MATCHES "^.*/Tests/RunCMake/file/READ_SYMLINK-build/test\\.txt$")
+ message(SEND_ERROR "Absolute symlink is \"${result}\", should be \"*/Tests/RunCMake/file/READ_SYMLINK-build/test.txt\"")
+endif()
diff --git a/Tests/RunCMake/file/RunCMakeTest.cmake b/Tests/RunCMake/file/RunCMakeTest.cmake
index b9d76bf..b872824 100644
--- a/Tests/RunCMake/file/RunCMakeTest.cmake
+++ b/Tests/RunCMake/file/RunCMakeTest.cmake
@@ -55,6 +55,9 @@ run_cmake_command(GLOB-error-CONFIGURE_DEPENDS-SCRIPT_MODE ${CMAKE_COMMAND} -P
if(NOT WIN32 OR CYGWIN)
run_cmake(GLOB_RECURSE-cyclic-recursion)
run_cmake(INSTALL-SYMLINK)
+ run_cmake(READ_SYMLINK)
+ run_cmake(READ_SYMLINK-noexist)
+ run_cmake(READ_SYMLINK-notsymlink)
endif()
if(RunCMake_GENERATOR STREQUAL "Ninja")
-----------------------------------------------------------------------
Summary of changes:
Help/command/file.rst | 24 ++++++++++++++++
Help/release/3.13.rst | 13 +++++++++
Help/release/dev/file-read_symlink.rst | 5 ++++
Modules/FindCUDA/select_compute_arch.cmake | 18 ++++++++++--
Source/CPack/cpack.cxx | 10 +++++++
Source/cmFileCommand.cxx | 32 +++++++++++++++++++++-
Source/cmFileCommand.h | 1 +
Source/cmQtAutoGenInitializer.cxx | 9 ++++--
Tests/QtAutogen/Tests.cmake | 3 +-
.../CPack/tests/EXTERNAL/create_package.cmake | 2 ++
.../tests/EXTERNAL/stage_and_package-stdout.txt | 1 +
.../READ_SYMLINK-noexist-result.txt} | 0
.../RunCMake/file/READ_SYMLINK-noexist-stderr.txt | 6 ++++
Tests/RunCMake/file/READ_SYMLINK-noexist.cmake | 1 +
.../READ_SYMLINK-notsymlink-result.txt} | 0
.../file/READ_SYMLINK-notsymlink-stderr.txt | 6 ++++
Tests/RunCMake/file/READ_SYMLINK-notsymlink.cmake | 2 ++
Tests/RunCMake/file/READ_SYMLINK.cmake | 13 +++++++++
Tests/RunCMake/file/RunCMakeTest.cmake | 3 ++
.../file/SIZE-error-does-not-exist-stderr.txt | 5 ++--
.../RunCMake/file/SIZE-error-does-not-exist.cmake | 2 +-
21 files changed, 146 insertions(+), 10 deletions(-)
create mode 100644 Help/release/dev/file-read_symlink.rst
create mode 100644 Tests/RunCMake/CPack/tests/EXTERNAL/stage_and_package-stdout.txt
copy Tests/RunCMake/{while/MissingArgument-result.txt => file/READ_SYMLINK-noexist-result.txt} (100%)
create mode 100644 Tests/RunCMake/file/READ_SYMLINK-noexist-stderr.txt
create mode 100644 Tests/RunCMake/file/READ_SYMLINK-noexist.cmake
copy Tests/RunCMake/{while/MissingArgument-result.txt => file/READ_SYMLINK-notsymlink-result.txt} (100%)
create mode 100644 Tests/RunCMake/file/READ_SYMLINK-notsymlink-stderr.txt
create mode 100644 Tests/RunCMake/file/READ_SYMLINK-notsymlink.cmake
create mode 100644 Tests/RunCMake/file/READ_SYMLINK.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list