[Cmake-commits] CMake branch, master, updated. v3.14.0-rc4-343-g80b761b
Kitware Robot
kwrobot at kitware.com
Wed Mar 13 10:23:05 EDT 2019
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 80b761b9244d5ab9047082be40ebeee256be95ef (commit)
via 7b81b1c72c5885ac5ec8097ff8f15677e55d8f94 (commit)
via 40ad7cabc69149391d95c39bb578def164c80441 (commit)
via c0f53f743edd0946a267e384da0d390753409533 (commit)
via 61023e0b8f3835dd0ad8253158fa8f3e75d00a32 (commit)
via 2c280acdf836b661cdfb2bdf3a3b5f1fda15a424 (commit)
via 1b6a3047c6c2fc01afbcdba596bbbcaca8d7b43f (commit)
via da2e58893524414a84cde576a472293c4641fe8a (commit)
via 0c2469e3fbf359934f266aa5dbcc69d78a618bab (commit)
via 225675b1a27981584251b8e8c97c0f52a20173c0 (commit)
via b53766b2058160853a29c2bbf8dbfef7345552a4 (commit)
via b544e34af61d2f12a5da62e29de5d635171b2b1d (commit)
from 1b8c5a0c35bdc8e7004a56fca356f6c917e31a15 (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=80b761b9244d5ab9047082be40ebeee256be95ef
commit 80b761b9244d5ab9047082be40ebeee256be95ef
Merge: 7b81b1c da2e588
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 13 14:19:12 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 13 10:19:21 2019 -0400
Merge topic 'update-documentation'
da2e588935 cmake: Upgrade 'cmake -E' commands description
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3089
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b81b1c72c5885ac5ec8097ff8f15677e55d8f94
commit 7b81b1c72c5885ac5ec8097ff8f15677e55d8f94
Merge: 40ad7ca b53766b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 13 14:16:16 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 13 10:16:25 2019 -0400
Merge topic 'cuda_compiler_generator_expressions'
b53766b205 CUDA: Support compiler id and version generator expressions
b544e34af6 All VersionNode use the same capitalization pattern
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3085
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=40ad7cabc69149391d95c39bb578def164c80441
commit 40ad7cabc69149391d95c39bb578def164c80441
Merge: c0f53f7 2c280ac
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 13 14:15:02 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 13 10:15:10 2019 -0400
Merge topic 'ignore-json-deprecated-warnings'
2c280acdf8 JsonCpp: Ignore deprecation warnings
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3091
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0f53f743edd0946a267e384da0d390753409533
commit c0f53f743edd0946a267e384da0d390753409533
Merge: 61023e0 1b6a304
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 13 10:12:53 2019 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 13 10:12:53 2019 -0400
Merge branch 'release-3.14'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61023e0b8f3835dd0ad8253158fa8f3e75d00a32
commit 61023e0b8f3835dd0ad8253158fa8f3e75d00a32
Merge: 1b8c5a0 0c2469e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 13 10:12:51 2019 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 13 10:12:51 2019 -0400
Merge branch 'release-3.13'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c280acdf836b661cdfb2bdf3a3b5f1fda15a424
commit 2c280acdf836b661cdfb2bdf3a3b5f1fda15a424
Author: Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Tue Mar 12 17:14:02 2019 +0000
Commit: Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Tue Mar 12 17:14:02 2019 +0000
JsonCpp: Ignore deprecation warnings
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69e3064..abf62bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -538,6 +538,10 @@ macro (CMAKE_BUILD_UTILITIES)
message(FATAL_ERROR
"CMAKE_USE_SYSTEM_JSONCPP is ON but a JsonCpp is not found!")
endif()
+ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+ set_property(TARGET JsonCpp::JsonCpp APPEND PROPERTY
+ INTERFACE_COMPILE_OPTIONS -Wno-deprecated-declarations)
+ endif()
set(CMAKE_JSONCPP_LIBRARIES JsonCpp::JsonCpp)
else()
set(CMAKE_JSONCPP_LIBRARIES cmjsoncpp)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da2e58893524414a84cde576a472293c4641fe8a
commit da2e58893524414a84cde576a472293c4641fe8a
Author: Bartosz Kosiorek <bartosz.kosiorek at tomtom.com>
AuthorDate: Tue Mar 12 14:20:53 2019 +0100
Commit: Bartosz Kosiorek <bartosz.kosiorek at tomtom.com>
CommitDate: Tue Mar 12 16:01:33 2019 +0100
cmake: Upgrade 'cmake -E' commands description
Fixes: #13204
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index e9a08b5..c5a3c88 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -390,16 +390,20 @@ Available commands are:
Copy files to ``<destination>`` (either file or directory).
If multiple files are specified, the ``<destination>`` must be
directory and it must exist. Wildcards are not supported.
+ ``copy`` does follow symlinks. That means it does not copy symlinks,
+ but the files or directories it point to.
``copy_directory <dir>... <destination>``
Copy directories to ``<destination>`` directory.
If ``<destination>`` directory does not exist it will be created.
+ ``copy_directory`` does follow symlinks.
``copy_if_different <file>... <destination>``
Copy files to ``<destination>`` (either file or directory) if
they have changed.
If multiple files are specified, the ``<destination>`` must be
directory and it must exist.
+ ``copy_if_different`` does follow symlinks.
``echo [<string>...]``
Displays arguments as text.
@@ -459,13 +463,16 @@ Available commands are:
exist, the command returns a non-zero exit code, but no message
is logged. The ``-f`` option changes the behavior to return a
zero exit code (i.e. success) in such situations instead.
+ ``remove`` does not follow symlinks. That means it remove only symlinks
+ and not files it point to.
``remove_directory <dir>``
Remove a directory and its contents. If a directory does
not exist it will be silently ignored.
``rename <oldname> <newname>``
- Rename a file or directory (on one volume).
+ Rename a file or directory (on one volume). If file with the ``<newname>`` name
+ already exists, then it will be silently replaced.
``server``
Launch :manual:`cmake-server(7)` mode.
@@ -494,10 +501,11 @@ Available commands are:
``time <command> [<args>...]``
Run command and display elapsed time.
-``touch <file>``
- Touch a file.
+``touch <file>...``
+ Creates ``<file>`` if file do not exist.
+ If ``<file>`` exists, it is changing ``<file>`` access and modification times.
-``touch_nocreate <file>``
+``touch_nocreate <file>...``
Touch a file if it exists but do not create it. If a file does
not exist it will be silently ignored.
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index cefac7a..f996a3e 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -111,8 +111,8 @@ void CMakeCommandUsage(const char* program)
<< " tar [cxt][vf][zjJ] file.tar [file/dir1 file/dir2 ...]\n"
<< " - create or extract a tar or zip archive\n"
<< " time command [args...] - run command and display elapsed time\n"
- << " touch file - touch a file.\n"
- << " touch_nocreate file - touch a file but do not create it.\n"
+ << " touch <file>... - touch a <file>.\n"
+ << " touch_nocreate <file>... - touch a <file> but do not create it.\n"
<< " create_symlink old new - create a symbolic link new -> old\n"
#if defined(_WIN32) && !defined(__CYGWIN__)
<< "Available on Windows only:\n"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c2469e3fbf359934f266aa5dbcc69d78a618bab
commit 0c2469e3fbf359934f266aa5dbcc69d78a618bab
Merge: 30c3eff 7593bdf
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 12 09:42:02 2019 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 12 09:42:02 2019 -0400
Merge branch 'wix-cmake-downgrade-fix' into release-3.13
Merge-request: !3087
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b53766b2058160853a29c2bbf8dbfef7345552a4
commit b53766b2058160853a29c2bbf8dbfef7345552a4
Author: Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Mar 11 12:33:43 2019 -0400
Commit: Robert Maynard <robert.maynard at kitware.com>
CommitDate: Mon Mar 11 12:33:43 2019 -0400
CUDA: Support compiler id and version generator expressions
Introduce the CUDA_COMPILER_ID and CUDA_COMPILER_VERSION generator
expressions.
diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst
index 7f484a4..47409ab 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -121,6 +121,9 @@ Variable Queries
``$<CXX_COMPILER_ID:compiler_id>``
``1`` if the CMake-id of the CXX compiler matches ``compiler_id``,
otherwise ``0``.
+``$<CUDA_COMPILER_ID:compiler_id>``
+ ``1`` if the CMake-id of the CUDA compiler matches ``compiler_id``,
+ otherwise ``0``.
See also the :variable:`CMAKE_<LANG>_COMPILER_ID` variable.
``$<Fortran_COMPILER_ID:compiler_id>``
``1`` if the CMake-id of the Fortran compiler matches ``compiler_id``,
@@ -132,6 +135,9 @@ Variable Queries
``$<CXX_COMPILER_VERSION:version>``
``1`` if the version of the CXX compiler matches ``version``, otherwise ``0``.
See also the :variable:`CMAKE_<LANG>_COMPILER_VERSION` variable.
+``$<CUDA_COMPILER_VERSION:version>``
+ ``1`` if the version of the CXX compiler matches ``version``, otherwise ``0``.
+ See also the :variable:`CMAKE_<LANG>_COMPILER_VERSION` variable.
``$<Fortran_COMPILER_VERSION:version>``
``1`` if the version of the Fortran compiler matches ``version``, otherwise ``0``.
See also the :variable:`CMAKE_<LANG>_COMPILER_VERSION` variable.
@@ -346,6 +352,9 @@ Variable Queries
``$<CXX_COMPILER_ID>``
The CMake-id of the CXX compiler used.
See also the :variable:`CMAKE_<LANG>_COMPILER_ID` variable.
+``$<CUDA_COMPILER_ID>``
+ The CMake-id of the CUDA compiler used.
+ See also the :variable:`CMAKE_<LANG>_COMPILER_ID` variable.
``$<Fortran_COMPILER_ID>``
The CMake-id of the Fortran compiler used.
See also the :variable:`CMAKE_<LANG>_COMPILER_ID` variable.
@@ -355,6 +364,9 @@ Variable Queries
``$<CXX_COMPILER_VERSION>``
The version of the CXX compiler used.
See also the :variable:`CMAKE_<LANG>_COMPILER_VERSION` variable.
+``$<CUDA_COMPILER_VERSION>``
+ The version of the CUDA compiler used.
+ See also the :variable:`CMAKE_<LANG>_COMPILER_VERSION` variable.
``$<Fortran_COMPILER_VERSION>``
The version of the Fortran compiler used.
See also the :variable:`CMAKE_<LANG>_COMPILER_VERSION` variable.
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 6ee7fa5..0ba662d 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -690,6 +690,28 @@ static const struct CXXCompilerIdNode : public CompilerIdNode
}
} cxxCompilerIdNode;
+static const struct CUDACompilerIdNode : public CompilerIdNode
+{
+ CUDACompilerIdNode() {} // NOLINT(modernize-use-equals-default)
+
+ std::string Evaluate(
+ const std::vector<std::string>& parameters,
+ cmGeneratorExpressionContext* context,
+ const GeneratorExpressionContent* content,
+ cmGeneratorExpressionDAGChecker* dagChecker) const override
+ {
+ if (!context->HeadTarget) {
+ reportError(
+ context, content->GetOriginalExpression(),
+ "$<CUDA_COMPILER_ID> may only be used with binary targets. It may "
+ "not be used with add_custom_command or add_custom_target.");
+ return std::string();
+ }
+ return this->EvaluateWithLanguage(parameters, context, content, dagChecker,
+ "CUDA");
+ }
+} cudaCompilerIdNode;
+
static const struct FortranCompilerIdNode : public CompilerIdNode
{
FortranCompilerIdNode() {} // NOLINT(modernize-use-equals-default)
@@ -793,6 +815,28 @@ static const struct CXXCompilerVersionNode : public CompilerVersionNode
}
} cxxCompilerVersionNode;
+static const struct CUDACompilerVersionNode : public CompilerVersionNode
+{
+ CUDACompilerVersionNode() {} // NOLINT(modernize-use-equals-default)
+
+ std::string Evaluate(
+ const std::vector<std::string>& parameters,
+ cmGeneratorExpressionContext* context,
+ const GeneratorExpressionContent* content,
+ cmGeneratorExpressionDAGChecker* dagChecker) const override
+ {
+ if (!context->HeadTarget) {
+ reportError(
+ context, content->GetOriginalExpression(),
+ "$<CUDA_COMPILER_VERSION> may only be used with binary targets. It "
+ "may not be used with add_custom_command or add_custom_target.");
+ return std::string();
+ }
+ return this->EvaluateWithLanguage(parameters, context, content, dagChecker,
+ "CUDA");
+ }
+} cudaCompilerVersionNode;
+
static const struct FortranCompilerVersionNode : public CompilerVersionNode
{
FortranCompilerVersionNode() {} // NOLINT(modernize-use-equals-default)
@@ -2066,6 +2110,7 @@ const cmGeneratorExpressionNode* cmGeneratorExpressionNode::GetNode(
{ "NOT", ¬Node },
{ "C_COMPILER_ID", &cCompilerIdNode },
{ "CXX_COMPILER_ID", &cxxCompilerIdNode },
+ { "CUDA_COMPILER_ID", &cudaCompilerIdNode },
{ "Fortran_COMPILER_ID", &fortranCompilerIdNode },
{ "VERSION_GREATER", &versionGreaterNode },
{ "VERSION_GREATER_EQUAL", &versionGreaterEqNode },
@@ -2074,6 +2119,7 @@ const cmGeneratorExpressionNode* cmGeneratorExpressionNode::GetNode(
{ "VERSION_EQUAL", &versionEqualNode },
{ "C_COMPILER_VERSION", &cCompilerVersionNode },
{ "CXX_COMPILER_VERSION", &cxxCompilerVersionNode },
+ { "CUDA_COMPILER_VERSION", &cudaCompilerVersionNode },
{ "Fortran_COMPILER_VERSION", &fortranCompilerVersionNode },
{ "PLATFORM_ID", &platformIdNode },
{ "COMPILE_FEATURES", &compileFeaturesNode },
diff --git a/Tests/CudaOnly/WithDefs/CMakeLists.txt b/Tests/CudaOnly/WithDefs/CMakeLists.txt
index e58204d..00fd7d2 100644
--- a/Tests/CudaOnly/WithDefs/CMakeLists.txt
+++ b/Tests/CudaOnly/WithDefs/CMakeLists.txt
@@ -37,6 +37,8 @@ target_compile_definitions(CudaOnlyWithDefs
$<$<CONFIG:RELEASE>:$<BUILD_INTERFACE:${release_compile_defs}>>
-DDEF_COMPILE_LANG_$<COMPILE_LANGUAGE>
-DDEF_LANG_IS_CUDA=$<COMPILE_LANGUAGE:CUDA>
+ -DDEF_CUDA_COMPILER=$<CUDA_COMPILER_ID>
+ -DDEF_CUDA_COMPILER_VERSION=$<CUDA_COMPILER_VERSION>
)
target_include_directories(CudaOnlyWithDefs
diff --git a/Tests/CudaOnly/WithDefs/main.notcu b/Tests/CudaOnly/WithDefs/main.notcu
index 98f73ce..68a296b 100644
--- a/Tests/CudaOnly/WithDefs/main.notcu
+++ b/Tests/CudaOnly/WithDefs/main.notcu
@@ -39,6 +39,14 @@
# error "Expected DEF_LANG_IS_CUDA"
#endif
+#ifndef DEF_CUDA_COMPILER
+# error "DEF_CUDA_COMPILER not defined!"
+#endif
+
+#ifndef DEF_CUDA_COMPILER_VERSION
+# error "DEF_CUDA_COMPILER_VERSION not defined!"
+#endif
+
static __global__ void DetermineIfValidCudaDevice()
{
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b544e34af61d2f12a5da62e29de5d635171b2b1d
commit b544e34af61d2f12a5da62e29de5d635171b2b1d
Author: Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Mar 11 11:48:37 2019 -0400
Commit: Robert Maynard <robert.maynard at kitware.com>
CommitDate: Mon Mar 11 11:48:37 2019 -0400
All VersionNode use the same capitalization pattern
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index ce308cc..6ee7fa5 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -771,9 +771,9 @@ static const struct CCompilerVersionNode : public CompilerVersionNode
}
} cCompilerVersionNode;
-static const struct CxxCompilerVersionNode : public CompilerVersionNode
+static const struct CXXCompilerVersionNode : public CompilerVersionNode
{
- CxxCompilerVersionNode() {} // NOLINT(modernize-use-equals-default)
+ CXXCompilerVersionNode() {} // NOLINT(modernize-use-equals-default)
std::string Evaluate(
const std::vector<std::string>& parameters,
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 4 +++
Help/manual/cmake-generator-expressions.7.rst | 12 +++++++
Help/manual/cmake.1.rst | 16 ++++++---
Source/cmGeneratorExpressionNode.cxx | 50 +++++++++++++++++++++++++--
Source/cmcmd.cxx | 4 +--
Tests/CudaOnly/WithDefs/CMakeLists.txt | 2 ++
Tests/CudaOnly/WithDefs/main.notcu | 8 +++++
7 files changed, 88 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list