[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1536-g3741269
Stephen Kelly
steveire at gmail.com
Thu Jan 10 12:05:40 EST 2013
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, next has been updated
via 3741269ac53dfa42b5106a506504fae1d2887679 (commit)
via 7e9411eac0faaa0201bc2a607d8de7f436e12d6a (commit)
via 4d6b6633a8ce78f6810a16ced55fc4190a2b42b8 (commit)
from 66f05a4a4b061058ecd41bff01950b168b997e3a (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=3741269ac53dfa42b5106a506504fae1d2887679
commit 3741269ac53dfa42b5106a506504fae1d2887679
Merge: 66f05a4 7e9411e
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 10 12:05:38 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 10 12:05:38 2013 -0500
Merge topic 'LINK_INTERFACE_LIBRARIES-genex' into next
7e9411e Add test using shared libraries and INTERFACE genex
4d6b663 Fix typo in genex test invokation.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e9411eac0faaa0201bc2a607d8de7f436e12d6a
commit 7e9411eac0faaa0201bc2a607d8de7f436e12d6a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 10 18:01:46 2013 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jan 10 18:02:42 2013 +0100
Add test using shared libraries and INTERFACE genex
diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt
index fb17791..3e8b912 100644
--- a/Tests/ExportImport/Export/CMakeLists.txt
+++ b/Tests/ExportImport/Export/CMakeLists.txt
@@ -170,9 +170,29 @@ set_property(TARGET testLibLibraryRequired APPEND PROPERTY
"${CMAKE_CURRENT_SOURCE_DIR}"
)
-set_property(TARGET testLibRequired APPEND PROPERTY
+add_library(testSharedLibRequired SHARED testSharedLibRequired.cpp)
+generate_export_header(testSharedLibRequired)
+set_property(TARGET testSharedLibRequired APPEND PROPERTY
+ INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}"
+)
+set_property(TARGET testSharedLibRequired APPEND PROPERTY
+ INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}"
+ "${CMAKE_CURRENT_SOURCE_DIR}"
+)
+
+add_library(testSharedLibDepends SHARED testSharedLibDepends.cpp)
+set_property(TARGET testSharedLibDepends APPEND PROPERTY
+ INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}"
+)
+generate_export_header(testSharedLibDepends)
+
+set_property(TARGET testSharedLibDepends APPEND PROPERTY
+ INTERFACE_INCLUDE_DIRECTORIES
+ $<TARGET_PROPERTY:testSharedLibRequired,INTERFACE_INCLUDE_DIRECTORIES>
+)
+set_property(TARGET testSharedLibDepends APPEND PROPERTY
LINK_INTERFACE_LIBRARIES
- $<1:testLibLibraryRequired>
+ $<1:$<TARGET_NAME:testSharedLibRequired>>
)
install(TARGETS testLibRequired
@@ -183,10 +203,11 @@ install(TARGETS testLibRequired
testLibIncludeRequired5
testLibIncludeRequired6
testLibLibraryRequired
+ testSharedLibRequired
EXPORT RequiredExp DESTINATION lib )
install(EXPORT RequiredExp NAMESPACE Req:: FILE testLibRequiredConfig.cmake DESTINATION lib/cmake/testLibRequired)
-install(TARGETS testLibDepends EXPORT DependsExp DESTINATION lib )
+install(TARGETS testLibDepends testSharedLibDepends EXPORT DependsExp DESTINATION lib )
install(EXPORT DependsExp FILE testLibDependsConfig.cmake DESTINATION lib/cmake/testLibDepends)
diff --git a/Tests/ExportImport/Export/testSharedLibDepends.cpp b/Tests/ExportImport/Export/testSharedLibDepends.cpp
new file mode 100644
index 0000000..e279207
--- /dev/null
+++ b/Tests/ExportImport/Export/testSharedLibDepends.cpp
@@ -0,0 +1,8 @@
+
+#include "testSharedLibDepends.h"
+
+int TestSharedLibDepends::foo()
+{
+ TestSharedLibRequired req;
+ return req.foo();
+}
diff --git a/Tests/ExportImport/Export/testSharedLibDepends.h b/Tests/ExportImport/Export/testSharedLibDepends.h
new file mode 100644
index 0000000..b93143a
--- /dev/null
+++ b/Tests/ExportImport/Export/testSharedLibDepends.h
@@ -0,0 +1,14 @@
+
+#ifndef TESTSHAREDLIBDEPENDS_H
+#define TESTSHAREDLIBDEPENDS_H
+
+#include "testsharedlibdepends_export.h"
+
+#include "testSharedLibRequired.h"
+
+struct TESTSHAREDLIBDEPENDS_EXPORT TestSharedLibDepends
+{
+ int foo();
+};
+
+#endif
diff --git a/Tests/ExportImport/Export/testSharedLibRequired.cpp b/Tests/ExportImport/Export/testSharedLibRequired.cpp
new file mode 100644
index 0000000..1ac34aa
--- /dev/null
+++ b/Tests/ExportImport/Export/testSharedLibRequired.cpp
@@ -0,0 +1,7 @@
+
+#include "testSharedLibRequired.h"
+
+int TestSharedLibRequired::foo()
+{
+ return 0;
+}
diff --git a/Tests/ExportImport/Export/testSharedLibRequired.h b/Tests/ExportImport/Export/testSharedLibRequired.h
new file mode 100644
index 0000000..edaddd4
--- /dev/null
+++ b/Tests/ExportImport/Export/testSharedLibRequired.h
@@ -0,0 +1,12 @@
+
+#ifndef TESTSHAREDLIBREQUIRED_H
+#define TESTSHAREDLIBREQUIRED_H
+
+#include "testsharedlibrequired_export.h"
+
+struct TESTSHAREDLIBREQUIRED_EXPORT TestSharedLibRequired
+{
+ int foo();
+};
+
+#endif
diff --git a/Tests/ExportImport/Import/A/CMakeLists.txt b/Tests/ExportImport/Import/A/CMakeLists.txt
index b77562e..b247cb0 100644
--- a/Tests/ExportImport/Import/A/CMakeLists.txt
+++ b/Tests/ExportImport/Import/A/CMakeLists.txt
@@ -167,3 +167,14 @@ set_property(TARGET deps_iface APPEND PROPERTY
INCLUDE_DIRECTORIES
$<TARGET_PROPERTY:testLibDepends,INTERFACE_INCLUDE_DIRECTORIES>
)
+
+add_executable(deps_shared_iface deps_shared_iface.cpp)
+target_link_libraries(deps_shared_iface testSharedLibDepends)
+set_property(TARGET deps_shared_iface APPEND PROPERTY
+ COMPILE_DEFINITIONS
+ $<TARGET_PROPERTY:testSharedLibDepends,INTERFACE_COMPILE_DEFINITIONS>
+)
+set_property(TARGET deps_shared_iface APPEND PROPERTY
+ INCLUDE_DIRECTORIES
+ $<TARGET_PROPERTY:testSharedLibDepends,INTERFACE_INCLUDE_DIRECTORIES>
+)
diff --git a/Tests/ExportImport/Import/A/deps_shared_iface.cpp b/Tests/ExportImport/Import/A/deps_shared_iface.cpp
new file mode 100644
index 0000000..4f7eb23
--- /dev/null
+++ b/Tests/ExportImport/Import/A/deps_shared_iface.cpp
@@ -0,0 +1,11 @@
+
+
+#include "testSharedLibDepends.h"
+
+int main(int,char **)
+{
+ TestSharedLibDepends dep;
+ TestSharedLibRequired req;
+
+ return dep.foo() + req.foo();
+}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d6b6633a8ce78f6810a16ced55fc4190a2b42b8
commit 4d6b6633a8ce78f6810a16ced55fc4190a2b42b8
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 10 17:54:12 2013 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jan 10 17:54:12 2013 +0100
Fix typo in genex test invokation.
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 6ed0af7..94e24c7 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -247,7 +247,7 @@ cmExportFileGenerator::ResolveTargetsInGeneratorExpressions(
for(std::vector<std::string>::iterator li = parts.begin();
li != parts.end(); ++li)
{
- if (!isGeneratorExpression(input))
+ if (!isGeneratorExpression(*li))
{
this->AddTargetNamespace(*li, target, missingTargets);
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmExportFileGenerator.cxx | 2 +-
Tests/ExportImport/Export/CMakeLists.txt | 27 +++++++++++++++++--
Tests/ExportImport/Export/testSharedLibDepends.cpp | 8 ++++++
Tests/ExportImport/Export/testSharedLibDepends.h | 14 ++++++++++
.../ExportImport/Export/testSharedLibRequired.cpp | 7 +++++
Tests/ExportImport/Export/testSharedLibRequired.h | 12 +++++++++
Tests/ExportImport/Import/A/CMakeLists.txt | 11 ++++++++
Tests/ExportImport/Import/A/deps_shared_iface.cpp | 11 ++++++++
8 files changed, 88 insertions(+), 4 deletions(-)
create mode 100644 Tests/ExportImport/Export/testSharedLibDepends.cpp
create mode 100644 Tests/ExportImport/Export/testSharedLibDepends.h
create mode 100644 Tests/ExportImport/Export/testSharedLibRequired.cpp
create mode 100644 Tests/ExportImport/Export/testSharedLibRequired.h
create mode 100644 Tests/ExportImport/Import/A/deps_shared_iface.cpp
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list