[Cmake-commits] CMake branch, master, updated. v3.11.1-698-gfc35e81
Kitware Robot
kwrobot at kitware.com
Fri May 4 09:45:05 EDT 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 fc35e817ee243d31c5846d09b0b21f2756a0727b (commit)
via efaaa729aa1c4ab2c351e7fb5ed5ea8712957db8 (commit)
via 46fa1af5142e72558fcd378e12f7ec7d7ee3c90d (commit)
via 4f82199befee194aa924fd4dcdb2f4aad1f7dab6 (commit)
from c89d2f4a6ae3e6cb0f87493cac3f5f723bb4f62e (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=fc35e817ee243d31c5846d09b0b21f2756a0727b
commit fc35e817ee243d31c5846d09b0b21f2756a0727b
Merge: efaaa72 46fa1af
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri May 4 13:35:51 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri May 4 09:37:14 2018 -0400
Merge topic 'test-CheckSourceTree-in-source'
46fa1af514 Tests: Fix CheckSourceTree for in-source non-dashboard builds
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2025
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efaaa729aa1c4ab2c351e7fb5ed5ea8712957db8
commit efaaa729aa1c4ab2c351e7fb5ed5ea8712957db8
Merge: c89d2f4 4f82199
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri May 4 13:35:32 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri May 4 09:36:08 2018 -0400
Merge topic 'genex-complang-not-loaded'
4f82199bef Genex: Allow COMPILE_LANGUAGE to name a language that is not loaded
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2031
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46fa1af5142e72558fcd378e12f7ec7d7ee3c90d
commit 46fa1af5142e72558fcd378e12f7ec7d7ee3c90d
Author: Israel Blancas <iblancasa at gmail.com>
AuthorDate: Tue May 1 20:23:05 2018 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu May 3 09:35:45 2018 -0400
Tests: Fix CheckSourceTree for in-source non-dashboard builds
For in-source builds we must tolerate non-tracked files in the
source tree. Previously we only tolerated them for dashboard
builds during automated testing, but we should tolerate them for
local user builds too.
Fixes: #17868
diff --git a/Tests/CMakeTests/CheckSourceTreeTest.cmake.in b/Tests/CMakeTests/CheckSourceTreeTest.cmake.in
index 8145db7..4f2aaea 100644
--- a/Tests/CMakeTests/CheckSourceTreeTest.cmake.in
+++ b/Tests/CMakeTests/CheckSourceTreeTest.cmake.in
@@ -308,13 +308,11 @@ message("=======================================================================
if("$ENV{DASHBOARD_TEST_FROM_CTEST}" STREQUAL "")
# developers are allowed to have local additions and modifications...
- set(is_dashboard 0)
message("interactive test run")
message("")
else()
- set(is_dashboard 1)
message("dashboard test run")
message("")
@@ -341,7 +339,7 @@ endif()
# Not even developers.
#
if(nonadditions)
- if(in_source_build AND is_dashboard)
+ if(in_source_build)
message("
warning: test results confounded because this is an 'in-source' build - cannot
distinguish between non-added files that are in-source build products and
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f82199befee194aa924fd4dcdb2f4aad1f7dab6
commit 4f82199befee194aa924fd4dcdb2f4aad1f7dab6
Author: Henry Schreiner <hschrein at cern.ch>
AuthorDate: Wed May 2 17:51:05 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu May 3 08:34:39 2018 -0400
Genex: Allow COMPILE_LANGUAGE to name a language that is not loaded
Evaluate to false on `$<COMPILE_LANGUAGE:Lang>` if language `Lang`
is not loaded. This is helpful in exported targets consumed in other
projects that may not enable all the same languages.
Fixes: #17952
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 399e894..7b35bce 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1013,16 +1013,7 @@ static const struct CompileLanguageNode : public cmGeneratorExpressionNode
return std::string();
}
- std::vector<std::string> enabledLanguages;
cmGlobalGenerator* gg = context->LG->GetGlobalGenerator();
- gg->GetEnabledLanguages(enabledLanguages);
- if (!parameters.empty() &&
- std::find(enabledLanguages.begin(), enabledLanguages.end(),
- parameters.front()) == enabledLanguages.end()) {
- reportError(context, content->GetOriginalExpression(),
- "$<COMPILE_LANGUAGE:...> Unknown language.");
- return std::string();
- }
std::string genName = gg->GetName();
if (genName.find("Makefiles") == std::string::npos &&
genName.find("Ninja") == std::string::npos &&
diff --git a/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-unknown-lang-result.txt b/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-unknown-lang-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-unknown-lang-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-unknown-lang-stderr.txt b/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-unknown-lang-stderr.txt
deleted file mode 100644
index 444da45..0000000
--- a/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-unknown-lang-stderr.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-CMake Error at COMPILE_LANGUAGE-unknown-lang.cmake:4 \(target_compile_options\):
- Error evaluating generator expression:
-
- \$<COMPILE_LANGUAGE:CXX>
-
- \$<COMPILE_LANGUAGE:...> Unknown language.
-Call Stack \(most recent call first\):
- CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-unknown-lang.cmake b/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-unknown-lang.cmake
index cec12a3..00dd290 100644
--- a/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-unknown-lang.cmake
+++ b/Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-unknown-lang.cmake
@@ -1,4 +1,4 @@
enable_language(C)
add_executable(empty empty.c)
-target_compile_options(empty PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-Wall>)
+target_compile_options(empty PRIVATE $<$<COMPILE_LANGUAGE:CXX>:$<TARGET_EXISTS:too,many,parameters>>)
-----------------------------------------------------------------------
Summary of changes:
Source/cmGeneratorExpressionNode.cxx | 9 ---------
Tests/CMakeTests/CheckSourceTreeTest.cmake.in | 4 +---
.../COMPILE_LANGUAGE-unknown-lang-result.txt | 1 -
.../COMPILE_LANGUAGE-unknown-lang-stderr.txt | 8 --------
.../GeneratorExpression/COMPILE_LANGUAGE-unknown-lang.cmake | 2 +-
5 files changed, 2 insertions(+), 22 deletions(-)
delete mode 100644 Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-unknown-lang-result.txt
delete mode 100644 Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-unknown-lang-stderr.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list