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 ff8917fdd2e8739a46c84ab03911258c23779744 (commit)
via cd1fa537a03377974a4d0a27e592785f931a41e5 (commit)
via 0e9f4bc00c6b26f254e74063e4026ac33b786513 (commit)
from 4d15c0b7c6f11c7486da7e760c59a1e7daabacab (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=ff8917fdd2e8739a46c84ab03911258c23779744
commit ff8917fdd2e8739a46c84ab03911258c23779744
Merge: 4d15c0b cd1fa53
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 5 09:38:59 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jun 5 09:38:59 2013 -0400
Merge topic 'VISIBILITY_PRESET-property'
cd1fa53 Add a COMPILE_OPTION for a VISIBILITY_INLINES_HIDDEN target
property.
0e9f4bc Introduce target property <LANG>_VISIBILITY_PRESET
diff --cc Source/cmNinjaTargetGenerator.cxx
index 6f912b8,778f86a..ae18a48
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@@ -150,10 -150,13 +150,13 @@@ cmNinjaTargetGenerator::ComputeFlagsFor
language.c_str(),
this->GetConfigName());
+ this->LocalGenerator->AddVisibilityPresetFlags(flags, this->Target,
+ language.c_str());
+
// Add include directory flags.
+ const char *config = this->Makefile->GetDefinition("CMAKE_BUILD_TYPE");
{
std::vector<std::string> includes;
- const char *config = this->Makefile->GetDefinition("CMAKE_BUILD_TYPE");
this->LocalGenerator->GetIncludeDirectories(includes,
this->GeneratorTarget,
language.c_str(), config);
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/Clang-CXX.cmake | 2 +
Modules/Compiler/Clang.cmake | 1 +
Modules/Compiler/GNU-CXX.cmake | 10 +++
Modules/Compiler/GNU.cmake | 3 +
Modules/Compiler/Intel-C.cmake | 4 +
Modules/Compiler/Intel-CXX.cmake | 4 +
Source/cmGlobalXCodeGenerator.cxx | 3 +
Source/cmLocalGenerator.cxx | 75 ++++++++++++++++++++
Source/cmLocalGenerator.h | 2 +
Source/cmMakefileTargetGenerator.cxx | 3 +
Source/cmNinjaTargetGenerator.cxx | 3 +
Source/cmTarget.cxx | 33 +++++++++
Tests/Module/GenerateExportHeader/CMakeLists.txt | 2 +
.../visibility_preset/CMakeLists.txt | 17 +++++
.../visibility_preset/main.cpp | 9 +++
.../visibility_preset/visibility_preset.cpp | 7 ++
.../visibility_preset/visibility_preset.h | 13 ++++
Tests/RunCMake/CMakeLists.txt | 16 ++++
.../CMakeLists.txt | 0
.../PropertyTypo-result.txt} | 0
.../VisibilityPreset/PropertyTypo-stderr.txt | 1 +
Tests/RunCMake/VisibilityPreset/PropertyTypo.cmake | 3 +
Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake | 3 +
.../foo.c => RunCMake/VisibilityPreset/lib.cpp} | 3 +-
24 files changed, 216 insertions(+), 1 deletions(-)
create mode 100644
Tests/Module/GenerateExportHeader/visibility_preset/CMakeLists.txt
create mode 100644 Tests/Module/GenerateExportHeader/visibility_preset/main.cpp
create mode 100644
Tests/Module/GenerateExportHeader/visibility_preset/visibility_preset.cpp
create mode 100644
Tests/Module/GenerateExportHeader/visibility_preset/visibility_preset.h
copy Tests/RunCMake/{PositionIndependentCode =>
VisibilityPreset}/CMakeLists.txt (100%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
VisibilityPreset/PropertyTypo-result.txt} (100%)
create mode 100644 Tests/RunCMake/VisibilityPreset/PropertyTypo-stderr.txt
create mode 100644 Tests/RunCMake/VisibilityPreset/PropertyTypo.cmake
create mode 100644 Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake
copy Tests/{SourceGroups/sub1/foo.c => RunCMake/VisibilityPreset/lib.cpp} (56%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
