[Cmake-commits] CMake branch, master, updated. v2.8.11-291-g9331783

[Brad King]

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  93317839b0aa7b47e37aad96ef3e0d4cfea236ba (commit)
       via  a984f3257e95f29a72da6566859d4c6a8a5d749b (commit)
      from  ff8917fdd2e8739a46c84ab03911258c23779744 (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=93317839b0aa7b47e37aad96ef3e0d4cfea236ba
commit 93317839b0aa7b47e37aad96ef3e0d4cfea236ba
Merge: ff8917f a984f32
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 5 09:39:05 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 5 09:39:05 2013 -0400

    Merge topic 'add_compile_options-command'
    
    a984f32 Introduce add_compile_options command.

diff --cc Source/cmTarget.cxx
index ab051d0,eb1e3b2..7d25b91
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@@ -1640,11 -1611,15 +1640,19 @@@ void cmTarget::SetMakefile(cmMakefile* 
      {
      this->InsertInclude(*it);
      }
+   const std::vector<cmValueWithOrigin> parentOptions =
+                               this->Makefile->GetCompileOptionsEntries();
+ 
+   for (std::vector<cmValueWithOrigin>::const_iterator it
+               = parentOptions.begin(); it != parentOptions.end(); ++it)
+     {
+     this->InsertCompileOption(*it);
+     }
  
 +  this->SetPropertyDefault("C_VISIBILITY_PRESET", 0);
 +  this->SetPropertyDefault("CXX_VISIBILITY_PRESET", 0);
 +  this->SetPropertyDefault("VISIBILITY_INLINES_HIDDEN", 0);
 +
    if(this->TargetTypeValue == cmTarget::SHARED_LIBRARY
        || this->TargetTypeValue == cmTarget::MODULE_LIBRARY)
      {

-----------------------------------------------------------------------

Summary of changes:
 ...sCommand.cxx => cmAddCompileOptionsCommand.cxx} |   11 +--
 ...ptionCommand.h => cmAddCompileOptionsCommand.h} |   46 +++++++---------
 Source/cmCommands.cxx                              |    2 +
 Source/cmMakefile.cxx                              |   60 ++++++++++++++++++++
 Source/cmMakefile.h                                |    6 ++
 Source/cmTarget.cxx                                |   10 +++-
 .../add_compile_options/CMakeLists.txt             |   14 +++++
 Tests/CMakeCommands/add_compile_options/main.cpp   |   11 ++++
 8 files changed, 126 insertions(+), 34 deletions(-)
 copy Source/{cmAddDefinitionsCommand.cxx => cmAddCompileOptionsCommand.cxx} (75%)
 copy Source/{cmOptionCommand.h => cmAddCompileOptionsCommand.h} (52%)
 create mode 100644 Tests/CMakeCommands/add_compile_options/CMakeLists.txt
 create mode 100644 Tests/CMakeCommands/add_compile_options/main.cpp


hooks/post-receive
-- 
CMake