[Cmake-commits] CMake branch, master, updated. v3.2.0-397-gad6fbb8
Brad King
brad.king at kitware.com
Tue Mar 10 09:12:35 EDT 2015
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 ad6fbb88bbeb4db17f0f060525c638f0b7b01a33 (commit)
via 232a6883a1fe480def1743af6d711097b98b026e (commit)
via 9e1689413fd1e54e8056b7d369cd508636987072 (commit)
via b734fa44719a780683e2eb0dfaabd38d64daa3f6 (commit)
via 0b945ea9a6a38d1b3ee27cc32afb4268bd571600 (commit)
via 5c559f11137dcb14113a3c5df99ff896c65c7596 (commit)
via e387ce7d681f9bd6c90c41f34b7500dfeb3b32ba (commit)
via 4a0128f42feb7da9b6bebe0c2c3aa7a756b96822 (commit)
from cce9671b4fea099c5109569108bca2dafe92a97e (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad6fbb88bbeb4db17f0f060525c638f0b7b01a33
commit ad6fbb88bbeb4db17f0f060525c638f0b7b01a33
Merge: cce9671 232a688
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 10 09:12:34 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 10 09:12:34 2015 -0400
Merge topic 'target-language-genex'
232a6883 Help: Add release notes for target-language-genex.
9e168941 File(GENERATE): Process genex evaluation files for each language.
b734fa44 Genex: Allow COMPILE_LANGUAGE when processing include directories.
0b945ea9 Genex: Allow COMPILE_LANGUAGE when processing compile definitions.
5c559f11 Genex: Enable use of COMPILE_LANGUAGE for compile options.
e387ce7d Genex: Add a COMPILE_LANGUAGE generator expression.
4a0128f4 VS6: Compute CMAKE_*_FLAGS and COMPILE_DEFINITIONS* only when needed
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-generator-expressions.7.rst | 44 ++++++
Help/release/dev/target-language-genex.rst | 9 ++
Source/cmExtraCodeBlocksGenerator.cxx | 2 +-
Source/cmExtraSublimeTextGenerator.cxx | 2 +-
Source/cmGeneratorExpression.cxx | 10 +-
Source/cmGeneratorExpression.h | 6 +-
Source/cmGeneratorExpressionEvaluationFile.cxx | 51 +++++--
Source/cmGeneratorExpressionEvaluationFile.h | 2 +-
Source/cmGeneratorExpressionEvaluator.cxx | 76 +++++++++-
Source/cmGeneratorExpressionEvaluator.h | 1 +
Source/cmGeneratorTarget.cxx | 5 +-
Source/cmGeneratorTarget.h | 2 +-
Source/cmGlobalXCodeGenerator.cxx | 2 +-
Source/cmLocalGenerator.cxx | 12 +-
Source/cmLocalGenerator.h | 3 +-
Source/cmLocalUnixMakefileGenerator3.cxx | 50 +++++--
Source/cmLocalVisualStudio6Generator.cxx | 145 ++++++++++----------
Source/cmLocalVisualStudio7Generator.cxx | 2 +-
Source/cmMakefileTargetGenerator.cxx | 36 +----
Source/cmNinjaTargetGenerator.cxx | 2 +-
Source/cmQtAutoGenerators.cxx | 2 +-
Source/cmTarget.cxx | 52 ++++---
Source/cmTarget.h | 9 +-
Source/cmVisualStudio10TargetGenerator.cxx | 3 +-
.../target_compile_definitions/CMakeLists.txt | 15 ++
.../target_compile_definitions/consumer.c | 23 ++++
.../target_compile_definitions/consumer.cpp | 18 +++
.../target_compile_options/CMakeLists.txt | 15 ++
.../target_compile_options/consumer.c | 23 ++++
.../target_compile_options/consumer.cpp | 18 +++
.../target_include_directories/CMakeLists.txt | 14 ++
.../target_include_directories/c_only/c_only.h | 2 +
.../target_include_directories/consumer.c | 10 ++
.../target_include_directories/consumer.cpp | 9 ++
.../target_include_directories/cxx_only/cxx_only.h | 2 +
Tests/RunCMake/CMakeLists.txt | 2 +
.../CMakeLists.txt | 0
.../CompileDefinitions-result.txt} | 0
.../CompileDefinitions-stderr-VS.txt | 8 ++
.../CompileDefinitions-stderr-Xcode.txt | 9 ++
.../CompileDefinitions.cmake | 5 +
.../CompileOptions-result.txt} | 0
.../CompileOptions-stderr-VS.txt | 8 ++
.../COMPILE_LANGUAGE-genex/CompileOptions.cmake | 5 +
.../IncludeDirectories-result.txt} | 0
.../IncludeDirectories-stderr-VS.txt | 8 ++
.../IncludeDirectories-stderr-Xcode.txt | 9 ++
.../IncludeDirectories.cmake | 5 +
.../COMPILE_LANGUAGE-genex/RunCMakeTest.cmake | 20 +++
Tests/RunCMake/COMPILE_LANGUAGE-genex/main.cpp | 5 +
.../COMPILE_LANGUAGE-genex-result.txt} | 0
.../File_Generate/COMPILE_LANGUAGE-genex.cmake | 12 ++
.../File_Generate/OutputConflict-stderr.txt | 2 +-
Tests/RunCMake/File_Generate/RunCMakeTest.cmake | 10 ++
Tests/RunCMake/File_Generate/empty.c | 8 ++
...COMPILE_LANGUAGE-add_custom_command-result.txt} | 0
.../COMPILE_LANGUAGE-add_custom_command-stderr.txt | 10 ++
.../COMPILE_LANGUAGE-add_custom_command.cmake | 8 ++
.../COMPILE_LANGUAGE-add_custom_target-result.txt} | 0
.../COMPILE_LANGUAGE-add_custom_target-stderr.txt | 10 ++
.../COMPILE_LANGUAGE-add_custom_target.cmake | 6 +
.../COMPILE_LANGUAGE-add_executable-result.txt} | 0
.../COMPILE_LANGUAGE-add_executable-stderr.txt | 10 ++
.../COMPILE_LANGUAGE-add_executable.cmake | 4 +
.../COMPILE_LANGUAGE-add_library-result.txt} | 0
.../COMPILE_LANGUAGE-add_library-stderr.txt | 10 ++
.../COMPILE_LANGUAGE-add_library.cmake | 4 +
.../COMPILE_LANGUAGE-add_test-result.txt} | 0
.../COMPILE_LANGUAGE-add_test-stderr.txt | 10 ++
.../COMPILE_LANGUAGE-add_test.cmake | 5 +
.../COMPILE_LANGUAGE-install-result.txt} | 0
.../COMPILE_LANGUAGE-install-stderr.txt | 8 ++
.../COMPILE_LANGUAGE-install.cmake | 5 +
.../COMPILE_LANGUAGE-target_sources-result.txt} | 0
.../COMPILE_LANGUAGE-target_sources-stderr.txt | 10 ++
.../COMPILE_LANGUAGE-target_sources.cmake | 5 +
.../COMPILE_LANGUAGE-unknown-lang-result.txt} | 0
.../COMPILE_LANGUAGE-unknown-lang-stderr.txt | 8 ++
.../COMPILE_LANGUAGE-unknown-lang.cmake | 4 +
.../GeneratorExpression/RunCMakeTest.cmake | 8 ++
80 files changed, 741 insertions(+), 177 deletions(-)
create mode 100644 Help/release/dev/target-language-genex.rst
create mode 100644 Tests/CMakeCommands/target_compile_definitions/consumer.c
create mode 100644 Tests/CMakeCommands/target_compile_options/consumer.c
create mode 100644 Tests/CMakeCommands/target_include_directories/c_only/c_only.h
create mode 100644 Tests/CMakeCommands/target_include_directories/consumer.c
create mode 100644 Tests/CMakeCommands/target_include_directories/cxx_only/cxx_only.h
copy Tests/RunCMake/{CMP0055 => COMPILE_LANGUAGE-genex}/CMakeLists.txt (100%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => COMPILE_LANGUAGE-genex/CompileDefinitions-result.txt} (100%)
create mode 100644 Tests/RunCMake/COMPILE_LANGUAGE-genex/CompileDefinitions-stderr-VS.txt
create mode 100644 Tests/RunCMake/COMPILE_LANGUAGE-genex/CompileDefinitions-stderr-Xcode.txt
create mode 100644 Tests/RunCMake/COMPILE_LANGUAGE-genex/CompileDefinitions.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => COMPILE_LANGUAGE-genex/CompileOptions-result.txt} (100%)
create mode 100644 Tests/RunCMake/COMPILE_LANGUAGE-genex/CompileOptions-stderr-VS.txt
create mode 100644 Tests/RunCMake/COMPILE_LANGUAGE-genex/CompileOptions.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => COMPILE_LANGUAGE-genex/IncludeDirectories-result.txt} (100%)
create mode 100644 Tests/RunCMake/COMPILE_LANGUAGE-genex/IncludeDirectories-stderr-VS.txt
create mode 100644 Tests/RunCMake/COMPILE_LANGUAGE-genex/IncludeDirectories-stderr-Xcode.txt
create mode 100644 Tests/RunCMake/COMPILE_LANGUAGE-genex/IncludeDirectories.cmake
create mode 100644 Tests/RunCMake/COMPILE_LANGUAGE-genex/RunCMakeTest.cmake
create mode 100644 Tests/RunCMake/COMPILE_LANGUAGE-genex/main.cpp
copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => File_Generate/COMPILE_LANGUAGE-genex-result.txt} (100%)
create mode 100644 Tests/RunCMake/File_Generate/COMPILE_LANGUAGE-genex.cmake
create mode 100644 Tests/RunCMake/File_Generate/empty.c
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorExpression/COMPILE_LANGUAGE-add_custom_command-result.txt} (100%)
create mode 100644 Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_command-stderr.txt
create mode 100644 Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_command.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorExpression/COMPILE_LANGUAGE-add_custom_target-result.txt} (100%)
create mode 100644 Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_target-stderr.txt
create mode 100644 Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_target.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorExpression/COMPILE_LANGUAGE-add_executable-result.txt} (100%)
create mode 100644 Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_executable-stderr.txt
create mode 100644 Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_executable.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorExpression/COMPILE_LANGUAGE-add_library-result.txt} (100%)
create mode 100644 Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_library-stderr.txt
create mode 100644 Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_library.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorExpression/COMPILE_LANGUAGE-add_test-result.txt} (100%)
create mode 100644 Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_test-stderr.txt
create mode 100644 Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_test.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorExpression/COMPILE_LANGUAGE-install-result.txt} (100%)
create mode 100644 Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-install-stderr.txt
create mode 100644 Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-install.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorExpression/COMPILE_LANGUAGE-target_sources-result.txt} (100%)
create mode 100644 Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-target_sources-stderr.txt
create mode 100644 Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-target_sources.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorExpression/COMPILE_LANGUAGE-unknown-lang-result.txt} (100%)
create mode 100644 Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-unknown-lang-stderr.txt
create mode 100644 Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-unknown-lang.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list