[Cmake-commits] CMake branch, master, updated. v3.1.0-rc2-416-g8e75f1d

Brad King brad.king at kitware.com
Mon Dec 1 08:57:35 EST 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  8e75f1d2fa3049ac31f4ebdbc255fca3e6414802 (commit)
       via  8a75c7ef32af391cb45af889d266e2a77daa61d6 (commit)
       via  e1348056662b9ae0d399374b6726173d7bf0e9bb (commit)
       via  bb5905bb1342229c06cecee735322a8a28916b76 (commit)
      from  2a92231630b6aee671c7f4e8b64f69cfd172b9e3 (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=8e75f1d2fa3049ac31f4ebdbc255fca3e6414802
commit 8e75f1d2fa3049ac31f4ebdbc255fca3e6414802
Merge: 2a92231 8a75c7e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 1 08:57:34 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 1 08:57:34 2014 -0500

    Merge topic 'target-sources-error-conditions'
    
    8a75c7ef Help: Document the export limitation of INTERFACE_SOURCES.
    e1348056 Export: Disallow export of targets with INTERFACE_SOURCES
    bb5905bb cmTarget: Don't allow relative paths in INTERFACE_SOURCES

diff --cc Help/prop_tgt/INTERFACE_SOURCES.rst
index a224b68,c8ca2e8..696ee95
--- a/Help/prop_tgt/INTERFACE_SOURCES.rst
+++ b/Help/prop_tgt/INTERFACE_SOURCES.rst
@@@ -1,17 -1,18 +1,21 @@@
  INTERFACE_SOURCES
  -----------------
  
 -List of interface sources to pass to the compiler.
 +List of interface sources to compile into consuming targets.
  
  Targets may populate this property to publish the sources
 -for consuming targets to compile.  Consuming
 -targets can add entries to their own :prop_tgt:`SOURCES` property
 -such as ``$<TARGET_PROPERTY:foo,INTERFACE_SOURCES>`` to use the
 -sources specified in the interface of ``foo``.
 +for consuming targets to compile.  The :command:`target_sources` command
 +populates this property with values given to the ``PUBLIC`` and
 +``INTERFACE`` keywords.  Projects may also get and set the property directly.
 +
 +When target dependencies are specified using :command:`target_link_libraries`,
 +CMake will read this property from all target dependencies to determine the
 +sources of the consumer.
  
+ Targets with ``INTERFACE_SOURCES`` may not be exported with the
+ :command:`export` or :command:`install(EXPORT)` commands. This limitation may be
+ lifted in a future version of CMake.
+ 
  Contents of ``INTERFACE_SOURCES`` may use "generator expressions"
  with the syntax ``$<...>``.  See the :manual:`cmake-generator-expressions(7)`
  manual for available expressions.  See the :manual:`cmake-buildsystem(7)`

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

Summary of changes:
 Help/command/target_sources.rst                    |    4 +++
 Help/prop_tgt/INTERFACE_SOURCES.rst                |    4 +++
 Source/cmExportBuildFileGenerator.cxx              |   10 ++++++++
 Source/cmExportInstallFileGenerator.cxx            |   11 +++++++++
 Source/cmTarget.cxx                                |   26 +++++++++++++++++---
 Tests/ConfigSources/CMakeLists.txt                 |    6 ++---
 .../ExportBuild-result.txt}                        |    0
 .../RunCMake/TargetSources/ExportBuild-stderr.txt  |    1 +
 Tests/RunCMake/TargetSources/ExportBuild.cmake     |    5 ++++
 .../ExportInstall-result.txt}                      |    0
 .../TargetSources/ExportInstall-stderr.txt         |    1 +
 Tests/RunCMake/TargetSources/ExportInstall.cmake   |    6 +++++
 Tests/RunCMake/TargetSources/OriginDebug.cmake     |    2 +-
 .../RelativePathInInterface-result.txt}            |    0
 .../RelativePathInInterface-stderr.txt             |    4 +++
 .../TargetSources/RelativePathInInterface.cmake    |    6 +++++
 Tests/RunCMake/TargetSources/RunCMakeTest.cmake    |    3 +++
 .../simple.cxx => RunCMake/TargetSources/main.cpp} |    0
 Tests/SourcesProperty/CMakeLists.txt               |    4 ++-
 19 files changed, 85 insertions(+), 8 deletions(-)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => TargetSources/ExportBuild-result.txt} (100%)
 create mode 100644 Tests/RunCMake/TargetSources/ExportBuild-stderr.txt
 create mode 100644 Tests/RunCMake/TargetSources/ExportBuild.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => TargetSources/ExportInstall-result.txt} (100%)
 create mode 100644 Tests/RunCMake/TargetSources/ExportInstall-stderr.txt
 create mode 100644 Tests/RunCMake/TargetSources/ExportInstall.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => TargetSources/RelativePathInInterface-result.txt} (100%)
 create mode 100644 Tests/RunCMake/TargetSources/RelativePathInInterface-stderr.txt
 create mode 100644 Tests/RunCMake/TargetSources/RelativePathInInterface.cmake
 copy Tests/{CTestTestCycle/simple.cxx => RunCMake/TargetSources/main.cpp} (100%)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list