[Cmake-commits] CMake branch, master, updated. v3.1.2-1100-g108e94e
Brad King
brad.king at kitware.com
Wed Feb 11 09:59:31 EST 2015
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 108e94ecf11d33f3d87ea3c09cfc7961aa785641 (commit)
via f7e33820b628f39ae2e0ba3d25279545dfe18f73 (commit)
via 6da65b3907419df28484c570f24d0da3593a0e5a (commit)
via 736bcb9664b714b91e8a2a573451e0453716f4da (commit)
via d9f8390db6ab0d776eb39b840a3b096b5422229f (commit)
via cc1520947608f5224a4fdfa94b5cb07e19e23600 (commit)
from c1772e5fb25b798a99cdcc820272ca9457123eb6 (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=108e94ecf11d33f3d87ea3c09cfc7961aa785641
commit 108e94ecf11d33f3d87ea3c09cfc7961aa785641
Merge: c1772e5 f7e3382
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 09:59:30 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 09:59:30 2015 -0500
Merge topic 'export-interface-source-files'
f7e33820 Add release notes for export-interface-source-files.
6da65b39 Allow export of targets with INTERFACE_SOURCES.
736bcb96 Tests: Move IfacePaths test stderr files.
d9f8390d Tests: Run IfacePaths tests with a parameter.
cc152094 Tests: Split part of include_directories test to a generic location.
-----------------------------------------------------------------------
Summary of changes:
Help/command/target_sources.rst | 4 -
Help/prop_tgt/INTERFACE_SOURCES.rst | 4 -
Help/release/dev/export-interface-source-files.rst | 6 +
Source/cmExportBuildFileGenerator.cxx | 13 +-
Source/cmExportFileGenerator.cxx | 136 +++++++++++++------
Source/cmExportFileGenerator.h | 5 +
Source/cmExportInstallFileGenerator.cxx | 28 ++--
Tests/ExportImport/Export/Interface/CMakeLists.txt | 12 +-
.../Export/Interface/source_target.cpp | 13 ++
.../Export/Interface/source_target_for_install.cpp | 13 ++
Tests/ExportImport/Import/Interface/CMakeLists.txt | 8 ++
.../Import/Interface/source_target_test.cpp | 7 +
Tests/RunCMake/CMakeLists.txt | 6 +
.../BinInInstallPrefix-CMP0052-NEW-result.txt} | 0
...fix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt} | 2 +-
.../BinInInstallPrefix-CMP0052-OLD-result.txt | 0
.../BinInInstallPrefix-CMP0052-WARN-result.txt | 0
...ix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt} | 6 +-
.../BinInInstallPrefix-result.txt} | 0
.../BinInInstallPrefix-stderr_SOURCES.txt | 6 +
.../BinaryDirectoryInInterface-result.txt} | 0
...toryInInterface-stderr_INCLUDE_DIRECTORIES.txt} | 2 +-
.../BinaryDirectoryInInterface-stderr_SOURCES.txt | 6 +
.../IfacePaths/BinaryDirectoryInInterface.cmake | 15 +++
.../CMakeLists.txt | 0
.../DirInInstallPrefix-result.txt | 0
Tests/RunCMake/IfacePaths/DirInInstallPrefix.cmake | 14 ++
.../InstallInBinDir-result.txt} | 0
...InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt} | 2 +-
.../IfacePaths/InstallInBinDir-stderr_SOURCES.txt | 6 +
.../InstallInSrcDir-result.txt} | 0
...InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt} | 2 +-
.../IfacePaths/InstallInSrcDir-stderr_SOURCES.txt | 6 +
.../InstallPrefixInInterface-result.txt | 0
.../InstallPrefixInInterface.cmake | 0
.../InstallToPrefixInSrcDirInSource-result.txt | 0
.../InstallToPrefixInSrcDirOutOfSource-result.txt | 0
.../RelativePathInGenex-result.txt} | 0
...tivePathInGenex-stderr_INCLUDE_DIRECTORIES.txt} | 0
.../RelativePathInGenex-stderr_SOURCES.txt | 4 +
.../RunCMake/IfacePaths/RelativePathInGenex.cmake | 13 ++
.../RelativePathInInterface-result.txt} | 0
...PathInInterface-stderr_INCLUDE_DIRECTORIES.txt} | 0
.../RelativePathInInterface-stderr_SOURCES.txt | 4 +
.../IfacePaths/RelativePathInInterface.cmake | 14 ++
.../RunCMakeTest.cmake | 42 +++---
.../SourceDirectoryInInterface-result.txt} | 0
...toryInInterface-stderr_INCLUDE_DIRECTORIES.txt} | 2 +-
.../SourceDirectoryInInterface-stderr_SOURCES.txt | 6 +
.../IfacePaths/SourceDirectoryInInterface.cmake | 15 +++
.../SrcInInstallPrefix-CMP0052-NEW-result.txt} | 0
...fix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt} | 2 +-
.../SrcInInstallPrefix-CMP0052-OLD-result.txt | 0
.../SrcInInstallPrefix-CMP0052-WARN-result.txt | 0
...ix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt} | 6 +-
.../SrcInInstallPrefix-result.txt} | 0
.../SrcInInstallPrefix-stderr_SOURCES.txt | 6 +
Tests/RunCMake/{CMP0004 => IfacePaths}/empty.cpp | 0
.../export-NOWARN-result.txt | 0
.../export-NOWARN.cmake | 15 +++
.../RunCMake/TargetSources/ExportBuild-result.txt | 2 +-
.../RunCMake/TargetSources/ExportBuild-stderr.txt | 1 -
.../TargetSources/ExportInstall-result.txt | 1 -
.../TargetSources/ExportInstall-stderr.txt | 1 -
Tests/RunCMake/TargetSources/ExportInstall.cmake | 6 -
Tests/RunCMake/TargetSources/RunCMakeTest.cmake | 1 -
.../BinInInstallPrefix-CMP0052-NEW-result.txt | 1 -
.../BinaryDirectoryInInterface-result.txt | 1 -
.../BinaryDirectoryInInterface.cmake | 11 --
Tests/RunCMake/include_directories/CMakeLists.txt | 5 +-
.../include_directories/DirInInstallPrefix.cmake | 9 --
.../include_directories/InstallInBinDir-result.txt | 1 -
.../include_directories/InstallInSrcDir-result.txt | 1 -
.../RelativePathInGenex-result.txt | 1 -
.../include_directories/RelativePathInGenex.cmake | 8 --
.../RelativePathInInterface-result.txt | 1 -
.../RelativePathInInterface.cmake | 11 --
.../include_directories/RunCMakeTest.cmake | 141 --------------------
.../SourceDirectoryInInterface-result.txt | 1 -
.../SourceDirectoryInInterface.cmake | 11 --
.../SrcInInstallPrefix-CMP0052-NEW-result.txt | 1 -
81 files changed, 349 insertions(+), 318 deletions(-)
create mode 100644 Help/release/dev/export-interface-source-files.rst
create mode 100644 Tests/ExportImport/Export/Interface/source_target.cpp
create mode 100644 Tests/ExportImport/Export/Interface/source_target_for_install.cpp
create mode 100644 Tests/ExportImport/Import/Interface/source_target_test.cpp
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/BinInInstallPrefix-CMP0052-NEW-result.txt} (100%)
rename Tests/RunCMake/{include_directories/BinInInstallPrefix-CMP0052-NEW-stderr.txt => IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt} (60%)
rename Tests/RunCMake/{include_directories => IfacePaths}/BinInInstallPrefix-CMP0052-OLD-result.txt (100%)
rename Tests/RunCMake/{include_directories => IfacePaths}/BinInInstallPrefix-CMP0052-WARN-result.txt (100%)
rename Tests/RunCMake/{include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt => IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt} (66%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/BinInInstallPrefix-result.txt} (100%)
create mode 100644 Tests/RunCMake/IfacePaths/BinInInstallPrefix-stderr_SOURCES.txt
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/BinaryDirectoryInInterface-result.txt} (100%)
rename Tests/RunCMake/{include_directories/BinaryDirectoryInInterface-stderr.txt => IfacePaths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt} (64%)
create mode 100644 Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr_SOURCES.txt
create mode 100644 Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface.cmake
copy Tests/RunCMake/{include_directories => IfacePaths}/CMakeLists.txt (100%)
rename Tests/RunCMake/{include_directories => IfacePaths}/DirInInstallPrefix-result.txt (100%)
create mode 100644 Tests/RunCMake/IfacePaths/DirInInstallPrefix.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/InstallInBinDir-result.txt} (100%)
rename Tests/RunCMake/{include_directories/InstallInBinDir-stderr.txt => IfacePaths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt} (65%)
create mode 100644 Tests/RunCMake/IfacePaths/InstallInBinDir-stderr_SOURCES.txt
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/InstallInSrcDir-result.txt} (100%)
rename Tests/RunCMake/{include_directories/InstallInSrcDir-stderr.txt => IfacePaths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt} (70%)
create mode 100644 Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr_SOURCES.txt
rename Tests/RunCMake/{include_directories => IfacePaths}/InstallPrefixInInterface-result.txt (100%)
rename Tests/RunCMake/{include_directories => IfacePaths}/InstallPrefixInInterface.cmake (100%)
rename Tests/RunCMake/{include_directories => IfacePaths}/InstallToPrefixInSrcDirInSource-result.txt (100%)
rename Tests/RunCMake/{include_directories => IfacePaths}/InstallToPrefixInSrcDirOutOfSource-result.txt (100%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/RelativePathInGenex-result.txt} (100%)
rename Tests/RunCMake/{include_directories/RelativePathInGenex-stderr.txt => IfacePaths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt} (100%)
create mode 100644 Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr_SOURCES.txt
create mode 100644 Tests/RunCMake/IfacePaths/RelativePathInGenex.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/RelativePathInInterface-result.txt} (100%)
rename Tests/RunCMake/{include_directories/RelativePathInInterface-stderr.txt => IfacePaths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt} (100%)
create mode 100644 Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr_SOURCES.txt
create mode 100644 Tests/RunCMake/IfacePaths/RelativePathInInterface.cmake
copy Tests/RunCMake/{include_directories => IfacePaths}/RunCMakeTest.cmake (86%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/SourceDirectoryInInterface-result.txt} (100%)
rename Tests/RunCMake/{include_directories/SourceDirectoryInInterface-stderr.txt => IfacePaths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt} (78%)
create mode 100644 Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr_SOURCES.txt
create mode 100644 Tests/RunCMake/IfacePaths/SourceDirectoryInInterface.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/SrcInInstallPrefix-CMP0052-NEW-result.txt} (100%)
rename Tests/RunCMake/{include_directories/SrcInInstallPrefix-CMP0052-NEW-stderr.txt => IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt} (69%)
rename Tests/RunCMake/{include_directories => IfacePaths}/SrcInInstallPrefix-CMP0052-OLD-result.txt (100%)
rename Tests/RunCMake/{include_directories => IfacePaths}/SrcInInstallPrefix-CMP0052-WARN-result.txt (100%)
rename Tests/RunCMake/{include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt => IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt} (72%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/SrcInInstallPrefix-result.txt} (100%)
create mode 100644 Tests/RunCMake/IfacePaths/SrcInInstallPrefix-stderr_SOURCES.txt
copy Tests/RunCMake/{CMP0004 => IfacePaths}/empty.cpp (100%)
rename Tests/RunCMake/{include_directories => IfacePaths}/export-NOWARN-result.txt (100%)
rename Tests/RunCMake/{include_directories => IfacePaths}/export-NOWARN.cmake (71%)
delete mode 100644 Tests/RunCMake/TargetSources/ExportBuild-stderr.txt
delete mode 100644 Tests/RunCMake/TargetSources/ExportInstall-result.txt
delete mode 100644 Tests/RunCMake/TargetSources/ExportInstall-stderr.txt
delete mode 100644 Tests/RunCMake/TargetSources/ExportInstall.cmake
delete mode 100644 Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-result.txt
delete mode 100644 Tests/RunCMake/include_directories/BinaryDirectoryInInterface-result.txt
delete mode 100644 Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake
delete mode 100644 Tests/RunCMake/include_directories/DirInInstallPrefix.cmake
delete mode 100644 Tests/RunCMake/include_directories/InstallInBinDir-result.txt
delete mode 100644 Tests/RunCMake/include_directories/InstallInSrcDir-result.txt
delete mode 100644 Tests/RunCMake/include_directories/RelativePathInGenex-result.txt
delete mode 100644 Tests/RunCMake/include_directories/RelativePathInGenex.cmake
delete mode 100644 Tests/RunCMake/include_directories/RelativePathInInterface-result.txt
delete mode 100644 Tests/RunCMake/include_directories/RelativePathInInterface.cmake
delete mode 100644 Tests/RunCMake/include_directories/SourceDirectoryInInterface-result.txt
delete mode 100644 Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake
delete mode 100644 Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-result.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list