[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3035-ga4b8fa4
Stephen Kelly
steveire at gmail.com
Thu Jul 11 03:55:51 EDT 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 a4b8fa40077a62edbc2f3c95073a66c1c92aa84e (commit)
via 4fb8ace00d835a81d9279818c62b02eaa2cf59b2 (commit)
via 4dc515f8e16f0a924fb7f941c1cfe704dea9e785 (commit)
from 8e3f6e702e1fa04c72284ffc70d58e84d0fe1c42 (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=a4b8fa40077a62edbc2f3c95073a66c1c92aa84e
commit a4b8fa40077a62edbc2f3c95073a66c1c92aa84e
Merge: 8e3f6e7 4fb8ace
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 11 03:55:47 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 11 03:55:47 2013 -0400
Merge topic 'framework-interface-includes' into next
4fb8ace Use linked frameworks as a source of include directories.
4dc515f CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4fb8ace00d835a81d9279818c62b02eaa2cf59b2
commit 4fb8ace00d835a81d9279818c62b02eaa2cf59b2
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jul 8 16:59:03 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jul 11 09:54:54 2013 +0200
Use linked frameworks as a source of include directories.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index a90fa74..e360a3d 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3206,6 +3206,29 @@ std::vector<std::string> cmTarget::GetIncludeDirectories(const char *config)
new cmTargetInternals::TargetPropertyEntry(cge,
it->Value));
}
+
+ if(this->Makefile->IsOn("APPLE"))
+ {
+ LinkImplementation const* impl = this->GetLinkImplementation(config,
+ this);
+ for(std::vector<std::string>::const_iterator
+ it = impl->Libraries.begin();
+ it != impl->Libraries.end(); ++it)
+ {
+ std::string libDir = *it;
+ libDir += "/../";
+ libDir = cmSystemTools::CollapseFullPath(libDir.c_str());
+ if(cmSystemTools::IsPathToFramework(libDir.c_str()))
+ {
+ cmGeneratorExpression ge(lfbt);
+ cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
+ ge.Parse(libDir);
+ this->Internal
+ ->CachedLinkInterfaceIncludeDirectoriesEntries[configString]
+ .push_back(new cmTargetInternals::TargetPropertyEntry(cge));
+ }
+ }
+ }
}
processIncludeDirectories(this,
diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt
index efecd03..912c680 100644
--- a/Tests/ExportImport/Export/CMakeLists.txt
+++ b/Tests/ExportImport/Export/CMakeLists.txt
@@ -280,6 +280,9 @@ install(
FRAMEWORK DESTINATION Frameworks
BUNDLE DESTINATION Applications
)
+if (APPLE)
+ install(FILES testLib4.h DESTINATION Frameworks/testLib4.framework/Headers)
+endif()
install(
TARGETS
testExe2libImp testLib3Imp
diff --git a/Tests/ExportImport/Export/testLib4.h b/Tests/ExportImport/Export/testLib4.h
new file mode 100644
index 0000000..9eeda7c
--- /dev/null
+++ b/Tests/ExportImport/Export/testLib4.h
@@ -0,0 +1,2 @@
+
+#define TESTLIB4_H
diff --git a/Tests/ExportImport/Import/A/CMakeLists.txt b/Tests/ExportImport/Import/A/CMakeLists.txt
index 3bfbc46..a02ad39 100644
--- a/Tests/ExportImport/Import/A/CMakeLists.txt
+++ b/Tests/ExportImport/Import/A/CMakeLists.txt
@@ -200,6 +200,10 @@ if (run_pic_test)
target_compile_definitions(deps_shared_iface PRIVATE CHECK_PIC_WORKS)
endif()
+if(APPLE)
+ add_subdirectory(framework_interface)
+endif()
+
#-----------------------------------------------------------------------------
# Test that targets imported from the build tree have their dependencies
# evaluated correctly. The above already tests the same for the install tree.
diff --git a/Tests/ExportImport/Import/A/framework_interface/CMakeLists.txt b/Tests/ExportImport/Import/A/framework_interface/CMakeLists.txt
new file mode 100644
index 0000000..0e00655
--- /dev/null
+++ b/Tests/ExportImport/Import/A/framework_interface/CMakeLists.txt
@@ -0,0 +1,9 @@
+
+add_library(exp_framework_test framework_test.cpp)
+get_target_property(exp_loc exp_testLib4 LOCATION)
+target_link_libraries(exp_framework_test ${exp_loc})
+
+
+add_library(bld_framework_test framework_test.cpp)
+get_target_property(bld_loc bld_testLib4 LOCATION)
+target_link_libraries(bld_framework_test ${bld_loc})
diff --git a/Tests/ExportImport/Import/A/framework_interface/framework_test.cpp b/Tests/ExportImport/Import/A/framework_interface/framework_test.cpp
new file mode 100644
index 0000000..357f64f
--- /dev/null
+++ b/Tests/ExportImport/Import/A/framework_interface/framework_test.cpp
@@ -0,0 +1,6 @@
+
+#include <testLib4/testLib4.h>
+
+#ifndef TESTLIB4_H
+#error Expected define TESTLIB4_H
+#endif
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/cmTarget.cxx | 23 ++++++++++++++++++++
Tests/ExportImport/Export/CMakeLists.txt | 3 ++
Tests/ExportImport/Export/testLib4.h | 2 +
Tests/ExportImport/Import/A/CMakeLists.txt | 4 +++
.../Import/A/framework_interface/CMakeLists.txt | 9 +++++++
.../A/framework_interface/framework_test.cpp | 6 +++++
7 files changed, 48 insertions(+), 1 deletions(-)
create mode 100644 Tests/ExportImport/Export/testLib4.h
create mode 100644 Tests/ExportImport/Import/A/framework_interface/CMakeLists.txt
create mode 100644 Tests/ExportImport/Import/A/framework_interface/framework_test.cpp
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list