[Cmake-commits] CMake branch, master, updated. v3.0.0-rc3-485-g5376151

Brad King brad.king at kitware.com
Thu Apr 3 12:51:55 EDT 2014


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  5376151aa1d724b6d7ddef8d2e521d97cbfa74ae (commit)
       via  9407174b1a0f1b4f8edf7fe08cc85ab6e990d59f (commit)
       via  81ad69e056d6c6dd2360e3345f6d99f268ee9e54 (commit)
       via  6e636f2ebaf78141f4d0a36c96804b9a1bc89857 (commit)
       via  3676fb49634efd01755aa5c12d58e2f2bf20d09f (commit)
       via  e6971df6ab647031ba9689c9afbbde78cc62e35f (commit)
       via  df753df94bb1e995372baabb0240585560c72ded (commit)
       via  869328aac31f8e702ac7039ce72c6fa485432733 (commit)
      from  93054aa84f283de17c58fa2ee19a2a4a1668027d (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=5376151aa1d724b6d7ddef8d2e521d97cbfa74ae
commit 5376151aa1d724b6d7ddef8d2e521d97cbfa74ae
Merge: 93054aa 9407174
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 3 12:51:53 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 3 12:51:53 2014 -0400

    Merge topic 'target-transitive-sources'
    
    9407174b target_sources: New command to add sources to target.
    81ad69e0 Make the SOURCES target property writable.
    6e636f2e cmTarget: Make the SOURCES origin tracable.
    3676fb49 cmTarget: Allow transitive evaluation of SOURCES property.
    e6971df6 cmTarget: Make the source files depend on the config.
    df753df9 cmGeneratorTarget: Don't add computed sources to the target.
    869328aa cmComputeTargetDepends: Use valid config to compute target depends.


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

Summary of changes:
 Help/command/target_sources.rst                    |   28 ++
 Help/manual/cmake-commands.7.rst                   |    1 +
 Help/manual/cmake-properties.7.rst                 |    1 +
 Help/prop_tgt/INTERFACE_SOURCES.rst                |   15 +
 Help/prop_tgt/SOURCES.rst                          |    3 +-
 Help/release/dev/target-INTERFACE_SOURCES.rst      |    5 +
 Help/release/dev/target-SOURCES-write.rst          |    6 +
 Help/release/dev/target_sources-command.rst        |    5 +
 Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst    |    3 +-
 Source/CMakeLists.txt                              |    1 +
 Source/cmComputeTargetDepends.cxx                  |   70 ++---
 Source/cmExtraCodeBlocksGenerator.cxx              |    3 +-
 Source/cmExtraCodeLiteGenerator.cxx                |    3 +-
 Source/cmExtraEclipseCDT4Generator.cxx             |    3 +-
 Source/cmExtraSublimeTextGenerator.cxx             |    3 +-
 Source/cmFLTKWrapUICommand.cxx                     |    2 +-
 Source/cmGeneratorExpressionDAGChecker.cxx         |   12 +
 Source/cmGeneratorExpressionDAGChecker.h           |    5 +-
 Source/cmGeneratorExpressionEvaluator.cxx          |    9 +-
 Source/cmGeneratorTarget.cxx                       |   75 +++--
 Source/cmGeneratorTarget.h                         |   32 +-
 Source/cmGlobalGenerator.cxx                       |   17 +-
 Source/cmGlobalKdevelopGenerator.cxx               |    3 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx          |    3 +-
 Source/cmGlobalVisualStudioGenerator.cxx           |   10 +-
 Source/cmGlobalXCodeGenerator.cxx                  |   28 +-
 Source/cmLocalGenerator.cxx                        |    7 +-
 Source/cmLocalUnixMakefileGenerator3.cxx           |    6 +-
 Source/cmLocalVisualStudio6Generator.cxx           |   37 ++-
 Source/cmLocalVisualStudio7Generator.cxx           |    9 +-
 Source/cmMakefileTargetGenerator.cxx               |   29 +-
 Source/cmNinjaNormalTargetGenerator.cxx            |    3 +-
 Source/cmNinjaTargetGenerator.cxx                  |   16 +-
 Source/cmNinjaUtilityTargetGenerator.cxx           |    4 +-
 Source/cmQtAutoGenerators.cxx                      |    4 +-
 Source/cmTarget.cxx                                |  321 +++++++++++++++++---
 Source/cmTarget.h                                  |   18 +-
 Source/cmTargetSourcesCommand.cxx                  |   64 ++++
 Source/cmTargetSourcesCommand.h                    |   55 ++++
 Source/cmVisualStudio10TargetGenerator.cxx         |   29 +-
 Tests/CMakeLists.txt                               |    5 +
 Tests/ConfigSources/CMakeLists.txt                 |   17 ++
 Tests/ConfigSources/iface_debug.h                  |    4 +
 Tests/ConfigSources/iface_debug_src.cpp            |    7 +
 Tests/ConfigSources/iface_src.cpp                  |    5 +
 Tests/ConfigSources/main.cpp                       |    7 +
 Tests/QtAutogen/CMakeLists.txt                     |    8 +-
 Tests/QtAutogen/debug_class.cpp                    |    9 +
 Tests/QtAutogen/debug_class.h                      |   20 ++
 Tests/QtAutogen/debug_class.ui                     |   45 +++
 Tests/QtAutogen/debug_resource.qrc                 |    5 +
 Tests/QtAutogen/main.cpp                           |    9 +
 Tests/QtAutogen/resourcetester.cpp                 |    4 +
 Tests/RunCMake/CMakeLists.txt                      |    1 +
 .../{CMP0004 => TargetSources}/CMakeLists.txt      |    0
 .../ConfigNotAllowed-result.txt}                   |    0
 .../TargetSources/ConfigNotAllowed-stderr.txt      |   14 +
 .../RunCMake/TargetSources/ConfigNotAllowed.cmake  |    2 +
 .../OriginDebug-result.txt}                        |    0
 .../RunCMake/TargetSources/OriginDebug-stderr.txt  |   31 ++
 Tests/RunCMake/TargetSources/OriginDebug.cmake     |   20 ++
 .../OriginDebugIDE-result.txt}                     |    0
 .../TargetSources/OriginDebugIDE-stderr.txt        |   40 +++
 Tests/RunCMake/TargetSources/OriginDebugIDE.cmake  |    4 +
 Tests/RunCMake/TargetSources/RunCMakeTest.cmake    |    9 +
 .../empty.cpp => TargetSources/empty_1.cpp}        |    0
 .../empty.cpp => TargetSources/empty_2.cpp}        |    0
 .../empty.cpp => TargetSources/empty_3.cpp}        |    0
 .../empty.cpp => TargetSources/empty_4.cpp}        |    0
 Tests/SourcesProperty/CMakeLists.txt               |   12 +
 Tests/SourcesProperty/iface.cpp                    |    5 +
 Tests/SourcesProperty/iface.h                      |    4 +
 Tests/SourcesProperty/main.cpp                     |    7 +
 Tests/SourcesProperty/prop.cpp                     |    5 +
 74 files changed, 1064 insertions(+), 183 deletions(-)
 create mode 100644 Help/command/target_sources.rst
 create mode 100644 Help/prop_tgt/INTERFACE_SOURCES.rst
 create mode 100644 Help/release/dev/target-INTERFACE_SOURCES.rst
 create mode 100644 Help/release/dev/target-SOURCES-write.rst
 create mode 100644 Help/release/dev/target_sources-command.rst
 create mode 100644 Source/cmTargetSourcesCommand.cxx
 create mode 100644 Source/cmTargetSourcesCommand.h
 create mode 100644 Tests/ConfigSources/CMakeLists.txt
 create mode 100644 Tests/ConfigSources/iface_debug.h
 create mode 100644 Tests/ConfigSources/iface_debug_src.cpp
 create mode 100644 Tests/ConfigSources/iface_src.cpp
 create mode 100644 Tests/ConfigSources/main.cpp
 create mode 100644 Tests/QtAutogen/debug_class.cpp
 create mode 100644 Tests/QtAutogen/debug_class.h
 create mode 100644 Tests/QtAutogen/debug_class.ui
 create mode 100644 Tests/QtAutogen/debug_resource.qrc
 copy Tests/RunCMake/{CMP0004 => TargetSources}/CMakeLists.txt (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => TargetSources/ConfigNotAllowed-result.txt} (100%)
 create mode 100644 Tests/RunCMake/TargetSources/ConfigNotAllowed-stderr.txt
 create mode 100644 Tests/RunCMake/TargetSources/ConfigNotAllowed.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => TargetSources/OriginDebug-result.txt} (100%)
 create mode 100644 Tests/RunCMake/TargetSources/OriginDebug-stderr.txt
 create mode 100644 Tests/RunCMake/TargetSources/OriginDebug.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => TargetSources/OriginDebugIDE-result.txt} (100%)
 create mode 100644 Tests/RunCMake/TargetSources/OriginDebugIDE-stderr.txt
 create mode 100644 Tests/RunCMake/TargetSources/OriginDebugIDE.cmake
 create mode 100644 Tests/RunCMake/TargetSources/RunCMakeTest.cmake
 copy Tests/RunCMake/{CMP0022/empty.cpp => TargetSources/empty_1.cpp} (100%)
 copy Tests/RunCMake/{CMP0022/empty.cpp => TargetSources/empty_2.cpp} (100%)
 copy Tests/RunCMake/{CMP0022/empty.cpp => TargetSources/empty_3.cpp} (100%)
 copy Tests/RunCMake/{CMP0022/empty.cpp => TargetSources/empty_4.cpp} (100%)
 create mode 100644 Tests/SourcesProperty/CMakeLists.txt
 create mode 100644 Tests/SourcesProperty/iface.cpp
 create mode 100644 Tests/SourcesProperty/iface.h
 create mode 100644 Tests/SourcesProperty/main.cpp
 create mode 100644 Tests/SourcesProperty/prop.cpp


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list