[Cmake-commits] CMake branch, master, updated. v3.7.1-839-gb88843d
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 b88843d651dc2c500af13c1fe882b389c4949b04 (commit) from 44ddd889af8c9934b2c73411e0aea7e323300abd (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=b88843d651dc2c500af13c1fe882b389c4949b04 commit b88843d651dc2c500af13c1fe882b389c4949b04 Author: Kitware Robot AuthorDate: Sat Dec 10 00:01:08 2016 -0500 Commit: Kitware Robot CommitDate: Sat Dec 10 00:01:08 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 7db770c..c837243 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 7) -set(CMake_VERSION_PATCH 20161209) +set(CMake_VERSION_PATCH 20161210) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1673-g6573bc3
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, next has been updated
via 6573bc3cfb0a24e091c9fc544a43d51064bb78b1 (commit)
via 3d840e4da4fcd1b57036d0906b014643d4cbcbf7 (commit)
from 8ea54462c97909a798b406b0eebb6cd1a703004f (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=6573bc3cfb0a24e091c9fc544a43d51064bb78b1
commit 6573bc3cfb0a24e091c9fc544a43d51064bb78b1
Merge: 8ea5446 3d840e4
Author: Daniel Pfeifer
AuthorDate: Fri Dec 9 16:09:00 2016 -0500
Commit: CMake Topic Stage
CommitDate: Fri Dec 9 16:09:00 2016 -0500
Merge topic 'rebuild-lexers' into next
3d840e4d fixup! Regenerate lexer source code
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d840e4da4fcd1b57036d0906b014643d4cbcbf7
commit 3d840e4da4fcd1b57036d0906b014643d4cbcbf7
Author: Daniel Pfeifer
AuthorDate: Fri Dec 9 21:57:43 2016 +0100
Commit: Daniel Pfeifer
CommitDate: Fri Dec 9 22:07:30 2016 +0100
fixup! Regenerate lexer source code
diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
index 07a9fdb..fa2fbe3 100644
--- a/CTestCustom.cmake.in
+++ b/CTestCustom.cmake.in
@@ -83,6 +83,10 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
"warning: Value stored to 'yytoken' is never read"
"index_encoder.c.241.2. warning: Value stored to .out_start. is never read"
"index.c.*warning: Access to field.*results in a dereference of a null
pointer.*loaded from variable.*"
+ "cmCommandArgumentLexer.cxx:[0-9]+:[0-9]+: warning: Call to 'realloc' has an
allocation size of 0 bytes"
+ "cmDependsJavaLexer.cxx:[0-9]+:[0-9]+: warning: Call to 'realloc' has an
allocation size of 0 bytes"
+ "cmExprLexer.cxx:[0-9]+:[0-9]+: warning: Call to 'realloc' has an allocation
size of 0 bytes"
+ "cmListFileLexer.c:[0-9]+:[0-9]+: warning: Call to 'realloc' has an
allocation size of 0 bytes"
"cmFortranLexer.cxx:[0-9]+:[0-9]+: warning: Call to 'realloc' has an
allocation size of 0 bytes"
"testProcess.*warning: Dereference of null pointer .loaded from variable
.invalidAddress.."
"liblzma/simple/x86.c:[0-9]+:[0-9]+: warning: The result of the '<<'
expression is undefined"
diff --git a/Source/cmCommandArgumentLexer.cxx
b/Source/cmCommandArgumentLexer.cxx
index bf8f350..22ddb90 100644
--- a/Source/cmCommandArgumentLexer.cxx
+++ b/Source/cmCommandArgumentLexer.cxx
@@ -462,7 +462,6 @@ Modify cmCommandArgumentLexer.cxx:
- remove trailing whitespace: sed -i 's/\s*$//' cmCommandArgumentLexer.h
cmCommandArgumentLexer.cxx
- remove blank lines at end of file
- #include "cmStandardLexer.h" at the top
- - change type of variable i in cmCommandArgument_yy_scan_bytes from
yy_size_t to int
*/
@@ -479,7 +478,7 @@ Modify cmCommandArgumentLexer.cxx:
/*--*/
-#line 482 "cmCommandArgumentLexer.cxx"
+#line 481 "cmCommandArgumentLexer.cxx"
#define INITIAL 0
#define ESCAPES 1
@@ -732,10 +731,10 @@ YY_DECL
}
{
-#line 40 "cmCommandArgumentLexer.in.l"
+#line 39 "cmCommandArgumentLexer.in.l"
-#line 738 "cmCommandArgumentLexer.cxx"
+#line 737 "cmCommandArgumentLexer.cxx"
while ( /*CONSTCOND*/1 )/* loops until end-of-file is
reached */
{
@@ -794,7 +793,7 @@ do_action: /* This label is used only to access EOF
actions. */
case 1:
YY_RULE_SETUP
-#line 42 "cmCommandArgumentLexer.in.l"
+#line 41 "cmCommandArgumentLexer.in.l"
{
//std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl;
yyextra->AllocateParserType(yylvalp, yytext+1, strlen(yytext)-2);
@@ -803,7 +802,7 @@ YY_RULE_SETUP
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 48 "cmCommandArgumentLexer.in.l"
+#line 47 "cmCommandArgumentLexer.in.l"
{
//std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl;
yyextra->AllocateParserType(yylvalp, yytext+1, strlen(yytext)-2);
@@ -812,7 +811,7 @@ YY_RULE_SETUP
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 54 "cmCommandArgumentLexer.in.l"
+#line 53 "cmCommandArgumentLexer.in.l"
{
//std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl;
yyextra->AllocateParserType(yylvalp, yytext+1, strlen(yytext)-2);
@@ -821,7 +820,7 @@ YY_RULE_SETUP
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 60 "cmCommandArgumentLexer.in.l"
+#line 59 "cmCommandArgumentLexer.in.l"
{
//std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl;
//yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
@@ -831,7 +830,7 @@ YY_RULE_SETUP
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 67 "cmCommandArgumentLexer.in.l"
+#line 66 "cmCommandArgumentL
[Cmake-commits] CMake branch, next, updated. v3.7.1-1671-g8ea5446
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, next has been updated
via 8ea54462c97909a798b406b0eebb6cd1a703004f (commit)
via c1a55079177c256c83ba5ab4bd7237ba69bf (commit)
via 7552d16d1a9ccfc86490b1052ed4719a704ae358 (commit)
from 99ba42de4a90b1ec468cf55a80eccb3f828776b9 (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=8ea54462c97909a798b406b0eebb6cd1a703004f
commit 8ea54462c97909a798b406b0eebb6cd1a703004f
Merge: 99ba42d c1a5507
Author: Brad King
AuthorDate: Fri Dec 9 14:28:18 2016 -0500
Commit: CMake Topic Stage
CommitDate: Fri Dec 9 14:28:18 2016 -0500
Merge topic 'cuda-fixups' into next
c1a55079 CUDA: Fix Cuda.Complex test case extern function signatures
7552d16d CUDA: Fix default compiler flag initialization
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1a55079177c256c83ba5ab4bd7237ba69bf
commit c1a55079177c256c83ba5ab4bd7237ba69bf
Author: Brad King
AuthorDate: Wed Dec 7 11:36:28 2016 -0500
Commit: Brad King
CommitDate: Fri Dec 9 14:19:22 2016 -0500
CUDA: Fix Cuda.Complex test case extern function signatures
Make the return types of the extern function declared in `main.cpp`
match those in the method implementations.
diff --git a/Tests/Cuda/Complex/main.cpp b/Tests/Cuda/Complex/main.cpp
index a72ffd7..32312d0 100644
--- a/Tests/Cuda/Complex/main.cpp
+++ b/Tests/Cuda/Complex/main.cpp
@@ -3,8 +3,8 @@
#include "file1.h"
#include "file2.h"
-result_type call_cuda_seperable_code(int x);
-result_type mixed_launch_kernel(int x);
+int call_cuda_seperable_code(int x);
+int mixed_launch_kernel(int x);
int main(int argc, char** argv)
{
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7552d16d1a9ccfc86490b1052ed4719a704ae358
commit 7552d16d1a9ccfc86490b1052ed4719a704ae358
Author: Brad King
AuthorDate: Tue Dec 6 16:22:25 2016 -0500
Commit: Brad King
CommitDate: Fri Dec 9 14:19:22 2016 -0500
CUDA: Fix default compiler flag initialization
Since commit v3.7.0-rc1~392^2 (Honor CMAKE__FLAGS[_]_INIT
set in toolchain files, 2016-07-05) our convention is to initialize
compiler flag variables via `string(APPEND)` rather than `set()`.
Fix the convention for `CMAKE_CUDA_FLAGS[_]_INIT`.
diff --git a/Modules/Compiler/NVIDIA-CUDA.cmake
b/Modules/Compiler/NVIDIA-CUDA.cmake
index e3ff5e3..605d555 100644
--- a/Modules/Compiler/NVIDIA-CUDA.cmake
+++ b/Modules/Compiler/NVIDIA-CUDA.cmake
@@ -10,11 +10,11 @@ set(CMAKE_SHARED_LIBRARY_CREATE_CUDA_FLAGS -shared)
set(CMAKE_INCLUDE_SYSTEM_FLAG_CUDA -isystem=)
set(CMAKE_CUDA_COMPILE_OPTIONS_VISIBILITY -Xcompiler=-fvisibility=)
-set(CMAKE_CUDA_FLAGS_INIT " ")
-set(CMAKE_CUDA_FLAGS_DEBUG_INIT " -g")
-set(CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG")
-set(CMAKE_CUDA_FLAGS_RELEASE_INIT " -O3 -DNDEBUG")
-set(CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
+string(APPEND CMAKE_CUDA_FLAGS_INIT " ")
+string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -g")
+string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG")
+string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -O3 -DNDEBUG")
+string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
set(CMAKE_CUDA98_STANDARD_COMPILE_OPTION "")
set(CMAKE_CUDA98_EXTENSION_COMPILE_OPTION "")
---
Summary of changes:
Modules/Compiler/NVIDIA-CUDA.cmake | 10 +-
Tests/Cuda/Complex/main.cpp|4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1668-g99ba42d
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, next has been updated via 99ba42de4a90b1ec468cf55a80eccb3f828776b9 (commit) via 44ddd889af8c9934b2c73411e0aea7e323300abd (commit) via 12bea47fa4d47b8e887ddbaf4c4fcc312d3052dc (commit) from 111b81958eb3d1350c430805b7a54e74bfa7350c (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=99ba42de4a90b1ec468cf55a80eccb3f828776b9 commit 99ba42de4a90b1ec468cf55a80eccb3f828776b9 Merge: 111b819 44ddd88 Author: Brad King AuthorDate: Fri Dec 9 14:25:46 2016 -0500 Commit: Brad King CommitDate: Fri Dec 9 14:25:46 2016 -0500 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.7.1-838-g44ddd88
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 44ddd889af8c9934b2c73411e0aea7e323300abd (commit) via 12bea47fa4d47b8e887ddbaf4c4fcc312d3052dc (commit) from c7cd379179b42cc3ef3bd49e23f8ff264bbcd041 (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 - --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.7.1-9-g12bea47
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, release has been updated via 12bea47fa4d47b8e887ddbaf4c4fcc312d3052dc (commit) via c3b6b5babc0269a4b84093443bfb5ba273a6e11b (commit) from f243a34cce8e4591e913566d86c1a28dc3df7996 (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 - --- Summary of changes: Modules/FindBoost.cmake |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1665-g111b819
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, next has been updated via 111b81958eb3d1350c430805b7a54e74bfa7350c (commit) via c7cd379179b42cc3ef3bd49e23f8ff264bbcd041 (commit) via 0c38000393aef700b22a596e35c7975c7a7b1ad4 (commit) from a432a54e6f64d2519c5eda520d17e137af8371af (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=111b81958eb3d1350c430805b7a54e74bfa7350c commit 111b81958eb3d1350c430805b7a54e74bfa7350c Merge: a432a54 c7cd379 Author: Brad King AuthorDate: Fri Dec 9 14:24:04 2016 -0500 Commit: Brad King CommitDate: Fri Dec 9 14:24:04 2016 -0500 Merge branch 'master' into next --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.7.1-836-gc7cd379
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 c7cd379179b42cc3ef3bd49e23f8ff264bbcd041 (commit) via c3b6b5babc0269a4b84093443bfb5ba273a6e11b (commit) from 0c38000393aef700b22a596e35c7975c7a7b1ad4 (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=c7cd379179b42cc3ef3bd49e23f8ff264bbcd041 commit c7cd379179b42cc3ef3bd49e23f8ff264bbcd041 Merge: 0c38000 c3b6b5b Author: Brad King AuthorDate: Fri Dec 9 14:23:50 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 9 14:23:50 2016 -0500 Merge topic 'FindBoost-vs15' c3b6b5ba FindBoost: Add support for VS 2017 --- Summary of changes: Modules/FindBoost.cmake |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1662-ga432a54
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, next has been updated via a432a54e6f64d2519c5eda520d17e137af8371af (commit) via 4505411982aae1d5c79bd80c43b8cba5b3a462cf (commit) from 147b8fdfcacd3e56cc0703c560e2073cb60a3277 (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=a432a54e6f64d2519c5eda520d17e137af8371af commit a432a54e6f64d2519c5eda520d17e137af8371af Merge: 147b8fd 4505411 Author: Brad King AuthorDate: Fri Dec 9 14:16:02 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 9 14:16:02 2016 -0500 Merge topic 'document_cuda_standard_property' into next 45054119 Help: Document CUDA_STANDARD and related properties https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4505411982aae1d5c79bd80c43b8cba5b3a462cf commit 4505411982aae1d5c79bd80c43b8cba5b3a462cf Author: Robert Maynard AuthorDate: Thu Dec 8 16:48:17 2016 -0500 Commit: Brad King CommitDate: Fri Dec 9 14:13:06 2016 -0500 Help: Document CUDA_STANDARD and related properties diff --git a/Help/manual/cmake-compile-features.7.rst b/Help/manual/cmake-compile-features.7.rst index 13f7d16..d641856 100644 --- a/Help/manual/cmake-compile-features.7.rst +++ b/Help/manual/cmake-compile-features.7.rst @@ -337,3 +337,9 @@ versions specified for each: * ``MSVC``: Microsoft Visual Studio versions 2010 through 2015. * ``SunPro``: Oracle SolarisStudio version 12.4. * ``Intel``: Intel compiler versions 12.1 through 17.0. + +CMake is currently aware of the :prop_tgt:`language standards ` +from the following :variable:`compiler ids _COMPILER_ID>` as of the +versions specified for each: + +* ``NVIDIA``: NVIDIA nvcc compiler 7.5 though 8.0. diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index e55524c..55af853 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -144,6 +144,9 @@ Properties on Targets /prop_tgt/CONFIG_POSTFIX /prop_tgt/CROSSCOMPILING_EMULATOR /prop_tgt/CUDA_SEPARABLE_COMPILATION + /prop_tgt/CUDA_EXTENSIONS + /prop_tgt/CUDA_STANDARD + /prop_tgt/CUDA_STANDARD_REQUIRED /prop_tgt/CXX_EXTENSIONS /prop_tgt/CXX_STANDARD /prop_tgt/CXX_STANDARD_REQUIRED diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 8533f36..99b5eae 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -349,6 +349,9 @@ Variables for Languages /variable/CMAKE_C_EXTENSIONS /variable/CMAKE_C_STANDARD /variable/CMAKE_C_STANDARD_REQUIRED + /variable/CMAKE_CUDA_EXTENSIONS + /variable/CMAKE_CUDA_STANDARD + /variable/CMAKE_CUDA_STANDARD_REQUIRED /variable/CMAKE_CXX_COMPILE_FEATURES /variable/CMAKE_CXX_EXTENSIONS /variable/CMAKE_CXX_STANDARD diff --git a/Help/prop_tgt/CUDA_EXTENSIONS.rst b/Help/prop_tgt/CUDA_EXTENSIONS.rst new file mode 100644 index 000..098ca3c --- /dev/null +++ b/Help/prop_tgt/CUDA_EXTENSIONS.rst @@ -0,0 +1,17 @@ +CUDA_EXTENSIONS +--- + +Boolean specifying whether compiler specific extensions are requested. + +This property specifies whether compiler specific extensions should be +used. For some compilers, this results in adding a flag such +as ``-std=gnu++11`` instead of ``-std=c++11`` to the compile line. This +property is ``ON`` by default. The basic CUDA/C++ standard level is +controlled by the :prop_tgt:`CUDA_STANDARD` target property. + +See the :manual:`cmake-compile-features(7)` manual for information on +compile features and a list of supported compilers. + +This property is initialized by the value of +the :variable:`CMAKE_CUDA_EXTENSIONS` variable if it is set when a target +is created. diff --git a/Help/prop_tgt/CUDA_STANDARD.rst b/Help/prop_tgt/CUDA_STANDARD.rst new file mode 100644 index 000..b262814 --- /dev/null +++ b/Help/prop_tgt/CUDA_STANDARD.rst @@ -0,0 +1,32 @@ +CUDA_STANDARD +- + +The CUDA/C++ standard whose features are requested to build this target. + +This property specifies the CUDA/C++ standard whose features are requested +to build this target. For some compilers, this results in adding a +flag such as ``-std=gnu++11`` to the compile line. + +Supported values are ``98``, ``11``. + +If the value requested does not result in a compile flag being added for +the compiler in use, a previous standard flag will be added instead. This +means that using: + +.. code-block:: cmake + + set_property(TARGET tgt PROPERTY CUDA_STANDARD 11) + +with a compiler which does not support ``-std=gnu++11`` or an equivalent +flag will not result in an error or warning, but will instead add the +``-
[Cmake-commits] CMake branch, next, updated. v3.7.1-1660-g147b8fd
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, next has been updated
via 147b8fdfcacd3e56cc0703c560e2073cb60a3277 (commit)
via db61cd5d72f78aaf720f60f8e3a573fc36599bf9 (commit)
via b7771078ad1ade95a4ae310815be7971017e10e1 (commit)
via c58a5198e5eb8878ad111be2eafcfef75e94b54b (commit)
from f4a9406513d4c0f1bdc825325e3691ab83fc6b7b (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=147b8fdfcacd3e56cc0703c560e2073cb60a3277
commit 147b8fdfcacd3e56cc0703c560e2073cb60a3277
Merge: f4a9406 db61cd5
Author: Brad King
AuthorDate: Fri Dec 9 09:10:29 2016 -0500
Commit: CMake Topic Stage
CommitDate: Fri Dec 9 09:10:29 2016 -0500
Merge topic 'fix-ctest-launchers' into next
db61cd5d cmRulePlaceholderExpander: Remove unused member RuleLauncher
b7771078 Comment ExpandRuleVariables calls not preceded by launcher
insertion
c58a5198 Makefile: Restore RULE_LAUNCH_COMPILE generation on compilation
rules
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db61cd5d72f78aaf720f60f8e3a573fc36599bf9
commit db61cd5d72f78aaf720f60f8e3a573fc36599bf9
Author: Brad King
AuthorDate: Fri Dec 9 08:57:26 2016 -0500
Commit: Brad King
CommitDate: Fri Dec 9 08:59:17 2016 -0500
cmRulePlaceholderExpander: Remove unused member RuleLauncher
diff --git a/Source/cmRulePlaceholderExpander.h
b/Source/cmRulePlaceholderExpander.h
index 19c..da59a6e 100644
--- a/Source/cmRulePlaceholderExpander.h
+++ b/Source/cmRulePlaceholderExpander.h
@@ -57,7 +57,6 @@ public:
const char* LanguageCompileFlags;
const char* Defines;
const char* Includes;
-const char* RuleLauncher;
const char* DependencyFile;
const char* FilterPrefix;
};
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7771078ad1ade95a4ae310815be7971017e10e1
commit b7771078ad1ade95a4ae310815be7971017e10e1
Author: Brad King
AuthorDate: Fri Dec 9 08:54:10 2016 -0500
Commit: Brad King
CommitDate: Fri Dec 9 08:59:17 2016 -0500
Comment ExpandRuleVariables calls not preceded by launcher insertion
Call sites of `ExpandRuleVariables` are now responsible for inserting
the `RULE_LAUNCH_{COMPILE,LINK,CUSTOM}` values in rule command lines.
Audit all call sites and add a comment to each one that does not insert
a launcher to explain why.
diff --git a/Source/cmMakefileTargetGenerator.cxx
b/Source/cmMakefileTargetGenerator.cxx
index e3cde5e..06bf2f5 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -606,6 +606,7 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
lang_can_export_cmds && compileCommands.size() == 1) {
std::string compileCommand = compileCommands[0];
+ // no launcher for CMAKE_EXPORT_COMPILE_COMMANDS
rulePlaceholderExpander->ExpandRuleVariables(this->LocalGenerator,
compileCommand, vars);
std::string workingDirectory = cmSystemTools::CollapseFullPath(
@@ -741,6 +742,7 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
// Expand placeholders in the commands.
for (std::vector::iterator i = preprocessCommands.begin();
i != preprocessCommands.end(); ++i) {
+ // no launcher for preprocessor commands
rulePlaceholderExpander->ExpandRuleVariables(this->LocalGenerator,
*i, vars);
}
@@ -789,6 +791,7 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
// Expand placeholders in the commands.
for (std::vector::iterator i = assemblyCommands.begin();
i != assemblyCommands.end(); ++i) {
+ // no launcher for assembly commands
rulePlaceholderExpander->ExpandRuleVariables(this->LocalGenerator,
*i, vars);
}
diff --git a/Source/cmNinjaTargetGenerator.cxx
b/Source/cmNinjaTargetGenerator.cxx
index 1ac6cd4..489f120 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -1015,6 +1015,7 @@ void cmNinjaTargetGenerator::ExportObjectCompileCommand(
for (std::vector::iterator i = compileCmds.begin();
i != compileCmds.end(); ++i) {
+// no launcher for CMAKE_EXPORT_COMPILE_COMMANDS
rulePlaceholderExpander->ExpandRuleVariables(this->GetLocalGenerator(), *i,
compileObjectVars);
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c58a5198e5eb8878ad111be2eafcfef75e94b54b
commit c58a5198e5eb8878ad111be2eafcfef75e94b54b
Autho
