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 f8241136b42c7e1064ca8764c6fa5e17012127da (commit)
via ce0c303d62941d2b10098b1ec00de3ced8556919 (commit)
via 435c912848b08333e03c74439f725c9b96890d80 (commit)
via fe732264e9abb6249d1d112b24ce36b226590105 (commit)
from 5c57fdedb19897880e5c13f9a0dd35ad4087565c (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=f8241136b42c7e1064ca8764c6fa5e17012127da
commit f8241136b42c7e1064ca8764c6fa5e17012127da
Merge: 5c57fde ce0c303
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Oct 8 10:58:40 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Oct 8 10:58:40 2013 -0400
Merge topic 'INTERFACE_LIBRARY-target-type'
ce0c303 install: Teach EXPORT option to handle INTERFACE_LIBRARY targets
435c912 export: Add support for INTERFACE_LIBRARY targets
fe73226 Add the INTERFACE_LIBRARY target type.
diff --cc Source/cmLocalVisualStudio6Generator.cxx
index f00a937,f0f47cb..a665b93
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@@ -146,8 -151,10 +151,10 @@@ void cmLocalVisualStudio6Generator::Out
case cmTarget::GLOBAL_TARGET:
this->SetBuildType(UTILITY, l->first.c_str(), l->second);
break;
+ case cmTarget::INTERFACE_LIBRARY:
+ continue;
default:
- cmSystemTools::Error("Bad target type", l->first.c_str());
+ cmSystemTools::Error("Bad target type: ", l->first.c_str());
break;
}
// INCLUDE_EXTERNAL_MSPROJECT command only affects the workspace
-----------------------------------------------------------------------
Summary of changes:
Source/cmAddLibraryCommand.cxx | 40 +++++++-
Source/cmAddLibraryCommand.h | 10 ++
Source/cmComputeLinkDepends.cxx | 7 ++
Source/cmComputeLinkInformation.cxx | 5 +
Source/cmCoreTryCompile.cxx | 1 +
Source/cmExportBuildFileGenerator.cxx | 24 +++--
Source/cmExportCommand.cxx | 3 +-
Source/cmExportFileGenerator.cxx | 16 ++-
Source/cmExportInstallFileGenerator.cxx | 19 +++-
Source/cmGlobalGenerator.cxx | 4 +
Source/cmGlobalNinjaGenerator.cxx | 7 +-
Source/cmGlobalUnixMakefileGenerator3.cxx | 8 ++
Source/cmGlobalVisualStudio6Generator.cxx | 4 +
Source/cmGlobalVisualStudio7Generator.cxx | 4 +
Source/cmGlobalVisualStudio8Generator.cxx | 4 +
Source/cmGlobalVisualStudioGenerator.cxx | 4 +
Source/cmGlobalXCodeGenerator.cxx | 25 ++++-
Source/cmInstallCommand.cxx | 8 ++-
Source/cmInstallTargetGenerator.cxx | 5 +
Source/cmLocalGenerator.cxx | 8 ++
Source/cmLocalVisualStudio10Generator.cxx | 4 +
Source/cmLocalVisualStudio6Generator.cxx | 10 ++-
Source/cmLocalVisualStudio7Generator.cxx | 12 ++-
Source/cmMakefile.cxx | 5 +-
Source/cmMakefileTargetGenerator.cxx | 7 +-
Source/cmTarget.cxx | 111 +++++++++++++-------
Source/cmTarget.h | 1 +
Source/cmTargetLinkLibrariesCommand.cxx | 14 +++
Source/cmTargetPropCommandBase.cxx | 9 ++
Source/cmVisualStudio10TargetGenerator.cxx | 8 ++-
Tests/AliasTarget/CMakeLists.txt | 3 +
Tests/CMakeLists.txt | 1 +
Tests/CompatibleInterface/CMakeLists.txt | 2 +-
Tests/ExportImport/Export/CMakeLists.txt | 2 +
Tests/ExportImport/Export/Interface/CMakeLists.txt | 49 +++++++++
.../Export/Interface/headeronly/headeronly.h | 7 ++
Tests/ExportImport/Export/Interface/sharedlib.cpp | 7 ++
.../Export/Interface/sharedlib/sharedlib.h | 7 ++
Tests/ExportImport/Import/CMakeLists.txt | 3 +
Tests/ExportImport/Import/Interface/CMakeLists.txt | 55 ++++++++++
.../Import/Interface/headeronlytest.cpp | 17 +++
.../Import/Interface/interfacetest.cpp | 20 ++++
Tests/InterfaceLibrary/CMakeLists.txt | 15 +++
Tests/InterfaceLibrary/definetestexe.cpp | 9 ++
Tests/InterfaceLibrary/libsdir/CMakeLists.txt | 26 +++++
Tests/InterfaceLibrary/libsdir/shareddependlib.cpp | 7 ++
.../libsdir/shareddependlib/shareddependlib.h | 12 ++
Tests/InterfaceLibrary/libsdir/sharedlib.cpp | 12 ++
.../InterfaceLibrary/libsdir/sharedlib/sharedlib.h | 15 +++
Tests/InterfaceLibrary/sharedlibtestexe.cpp | 19 ++++
Tests/PositionIndependentTargets/CMakeLists.txt | 1 +
.../interface/CMakeLists.txt | 27 +++++
Tests/RunCMake/CMakeLists.txt | 1 +
.../Conflict4-result.txt} | 0
.../PositionIndependentCode/Conflict4-stderr.txt | 4 +
.../PositionIndependentCode/Conflict4.cmake | 8 ++
.../Conflict5-result.txt} | 0
.../{Conflict2-stderr.txt => Conflict5-stderr.txt} | 0
.../PositionIndependentCode/Conflict5.cmake | 9 ++
.../Conflict6-result.txt} | 0
.../{Conflict3-stderr.txt => Conflict6-stderr.txt} | 0
.../PositionIndependentCode/Conflict6.cmake | 8 ++
.../PositionIndependentCode/RunCMakeTest.cmake | 3 +
.../{CMP0004 => interface_library}/CMakeLists.txt | 0
.../RunCMake/interface_library/RunCMakeTest.cmake | 4 +
.../invalid_name-result.txt} | 0
.../interface_library/invalid_name-stderr.txt | 15 +++
.../RunCMake/interface_library/invalid_name.cmake | 6 +
.../target_commands-result.txt} | 0
.../interface_library/target_commands-stderr.txt | 47 ++++++++
.../interface_library/target_commands.cmake | 13 +++
71 files changed, 756 insertions(+), 65 deletions(-)
create mode 100644 Tests/ExportImport/Export/Interface/CMakeLists.txt
create mode 100644 Tests/ExportImport/Export/Interface/headeronly/headeronly.h
create mode 100644 Tests/ExportImport/Export/Interface/sharedlib.cpp
create mode 100644 Tests/ExportImport/Export/Interface/sharedlib/sharedlib.h
create mode 100644 Tests/ExportImport/Import/Interface/CMakeLists.txt
create mode 100644 Tests/ExportImport/Import/Interface/headeronlytest.cpp
create mode 100644 Tests/ExportImport/Import/Interface/interfacetest.cpp
create mode 100644 Tests/InterfaceLibrary/CMakeLists.txt
create mode 100644 Tests/InterfaceLibrary/definetestexe.cpp
create mode 100644 Tests/InterfaceLibrary/libsdir/CMakeLists.txt
create mode 100644 Tests/InterfaceLibrary/libsdir/shareddependlib.cpp
create mode 100644
Tests/InterfaceLibrary/libsdir/shareddependlib/shareddependlib.h
create mode 100644 Tests/InterfaceLibrary/libsdir/sharedlib.cpp
create mode 100644 Tests/InterfaceLibrary/libsdir/sharedlib/sharedlib.h
create mode 100644 Tests/InterfaceLibrary/sharedlibtestexe.cpp
create mode 100644 Tests/PositionIndependentTargets/interface/CMakeLists.txt
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
PositionIndependentCode/Conflict4-result.txt} (100%)
create mode 100644 Tests/RunCMake/PositionIndependentCode/Conflict4-stderr.txt
create mode 100644 Tests/RunCMake/PositionIndependentCode/Conflict4.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
PositionIndependentCode/Conflict5-result.txt} (100%)
copy Tests/RunCMake/PositionIndependentCode/{Conflict2-stderr.txt =>
Conflict5-stderr.txt} (100%)
create mode 100644 Tests/RunCMake/PositionIndependentCode/Conflict5.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
PositionIndependentCode/Conflict6-result.txt} (100%)
copy Tests/RunCMake/PositionIndependentCode/{Conflict3-stderr.txt =>
Conflict6-stderr.txt} (100%)
create mode 100644 Tests/RunCMake/PositionIndependentCode/Conflict6.cmake
copy Tests/RunCMake/{CMP0004 => interface_library}/CMakeLists.txt (100%)
create mode 100644 Tests/RunCMake/interface_library/RunCMakeTest.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
interface_library/invalid_name-result.txt} (100%)
create mode 100644 Tests/RunCMake/interface_library/invalid_name-stderr.txt
create mode 100644 Tests/RunCMake/interface_library/invalid_name.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
interface_library/target_commands-result.txt} (100%)
create mode 100644 Tests/RunCMake/interface_library/target_commands-stderr.txt
create mode 100644 Tests/RunCMake/interface_library/target_commands.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
