[Cmake-commits] CMake branch, master, updated. v3.0.0-rc6-978-g8df4d03

[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  8df4d03d99ba88394d931f41d679defdd226b193 (commit)
       via  d0b1d2a65be658663ce7314961e13036974f62e7 (commit)
       via  15a8af21e8bd8354dfff2063e01f695f85efdeb8 (commit)
      from  ca2b012cb9dd488b74871bf481b1bb9154fdf804 (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=8df4d03d99ba88394d931f41d679defdd226b193
commit 8df4d03d99ba88394d931f41d679defdd226b193
Merge: ca2b012 d0b1d2a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 28 12:34:36 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 28 12:34:36 2014 -0400

    Merge topic 'cpack-properties'
    
    d0b1d2a6 CPackWiX: Implement CPACK_NEVER_OVERWRITE and CPACK_PERMANENT properties
    15a8af21 Add an "installed file" property scope


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

Summary of changes:
 Help/manual/cmake-developer.7.rst                  |    8 +-
 Help/manual/cmake-properties.7.rst                 |    9 ++
 Help/prop_inst/CPACK_NEVER_OVERWRITE.rst           |    6 +
 Help/prop_inst/CPACK_PERMANENT.rst                 |    6 +
 Source/CMakeLists.txt                              |    4 +
 Source/CPack/WiX/cmCPackWIXGenerator.cxx           |    6 +-
 Source/CPack/WiX/cmWIXFilesSourceWriter.cxx        |   17 ++-
 Source/CPack/WiX/cmWIXFilesSourceWriter.h          |    3 +-
 Source/CPack/cmCPackGenerator.cxx                  |    8 ++
 Source/CPack/cmCPackGenerator.h                    |    3 +
 Source/CPack/cpack.cxx                             |    9 +-
 Source/cmCPackPropertiesGenerator.cxx              |   45 ++++++++
 Source/cmCPackPropertiesGenerator.h                |   38 +++++++
 Source/cmGetPropertyCommand.cxx                    |   37 ++++++-
 Source/cmGetPropertyCommand.h                      |    1 +
 Source/cmGlobalGenerator.cxx                       |   44 ++++++++
 Source/cmGlobalGenerator.h                         |    2 +
 Source/cmInstalledFile.cxx                         |  115 ++++++++++++++++++++
 Source/cmInstalledFile.h                           |   83 ++++++++++++++
 Source/cmProperty.h                                |    2 +-
 Source/cmRST.cxx                                   |    3 +-
 Source/cmSetPropertyCommand.cxx                    |   59 +++++++++-
 Source/cmSetPropertyCommand.h                      |    2 +
 Source/cmake.cxx                                   |   35 ++++++
 Source/cmake.h                                     |   12 ++
 Templates/CPackConfig.cmake.in                     |    8 ++
 Tests/RunCMake/CMakeLists.txt                      |    1 +
 .../CPackInstallProperties/Append-check.cmake      |    3 +
 Tests/RunCMake/CPackInstallProperties/Append.cmake |    2 +
 .../RunCMake/CPackInstallProperties/CMakeLists.txt |    6 +
 .../FilenameGenex-check.cmake                      |    3 +
 .../CPackInstallProperties/FilenameGenex.cmake     |    7 ++
 .../MultipleValues-check.cmake                     |    3 +
 .../CPackInstallProperties/MultipleValues.cmake    |    1 +
 .../PerConfigValue-check.cmake                     |   13 +++
 .../CPackInstallProperties/PerConfigValue.cmake    |   14 +++
 .../CPackInstallProperties/Replace-check.cmake     |    3 +
 .../RunCMake/CPackInstallProperties/Replace.cmake  |    2 +
 .../CPackInstallProperties/RunCMakeTest.cmake      |    9 ++
 .../CPackInstallProperties/Simple-check.cmake      |    3 +
 Tests/RunCMake/CPackInstallProperties/Simple.cmake |    1 +
 .../CPackInstallProperties/ValueGenex-check.cmake  |    3 +
 .../CPackInstallProperties/ValueGenex.cmake        |    7 ++
 Tests/RunCMake/CPackInstallProperties/check.cmake  |   12 ++
 .../CPackInstallProperties/test.cpp}               |    0
 Utilities/Sphinx/cmake.py                          |    4 +
 bootstrap                                          |    2 +
 47 files changed, 649 insertions(+), 15 deletions(-)
 create mode 100644 Help/prop_inst/CPACK_NEVER_OVERWRITE.rst
 create mode 100644 Help/prop_inst/CPACK_PERMANENT.rst
 create mode 100644 Source/cmCPackPropertiesGenerator.cxx
 create mode 100644 Source/cmCPackPropertiesGenerator.h
 create mode 100644 Source/cmInstalledFile.cxx
 create mode 100644 Source/cmInstalledFile.h
 create mode 100644 Tests/RunCMake/CPackInstallProperties/Append-check.cmake
 create mode 100644 Tests/RunCMake/CPackInstallProperties/Append.cmake
 create mode 100644 Tests/RunCMake/CPackInstallProperties/CMakeLists.txt
 create mode 100644 Tests/RunCMake/CPackInstallProperties/FilenameGenex-check.cmake
 create mode 100644 Tests/RunCMake/CPackInstallProperties/FilenameGenex.cmake
 create mode 100644 Tests/RunCMake/CPackInstallProperties/MultipleValues-check.cmake
 create mode 100644 Tests/RunCMake/CPackInstallProperties/MultipleValues.cmake
 create mode 100644 Tests/RunCMake/CPackInstallProperties/PerConfigValue-check.cmake
 create mode 100644 Tests/RunCMake/CPackInstallProperties/PerConfigValue.cmake
 create mode 100644 Tests/RunCMake/CPackInstallProperties/Replace-check.cmake
 create mode 100644 Tests/RunCMake/CPackInstallProperties/Replace.cmake
 create mode 100644 Tests/RunCMake/CPackInstallProperties/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/CPackInstallProperties/Simple-check.cmake
 create mode 100644 Tests/RunCMake/CPackInstallProperties/Simple.cmake
 create mode 100644 Tests/RunCMake/CPackInstallProperties/ValueGenex-check.cmake
 create mode 100644 Tests/RunCMake/CPackInstallProperties/ValueGenex.cmake
 create mode 100644 Tests/RunCMake/CPackInstallProperties/check.cmake
 copy Tests/{MissingInstall/mybin.cpp => RunCMake/CPackInstallProperties/test.cpp} (100%)


hooks/post-receive
-- 
CMake