[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3055-g5bd941d
Stephen Kelly
steveire at gmail.com
Thu Jul 11 11:29:00 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 5bd941d8989d869509eae108a6b01b4f10f882a3 (commit)
via 16af722cf42fcd91f9d0bb48eeb3035a49dad809 (commit)
from 6868b1342dca01eb67257848d878afcf8db1a2cb (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=5bd941d8989d869509eae108a6b01b4f10f882a3
commit 5bd941d8989d869509eae108a6b01b4f10f882a3
Merge: 6868b13 16af722
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 11 11:28:57 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 11 11:28:57 2013 -0400
Merge topic 'framework-interface-includes' into next
16af722 Revert "Use linked frameworks as a source of include directories."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16af722cf42fcd91f9d0bb48eeb3035a49dad809
commit 16af722cf42fcd91f9d0bb48eeb3035a49dad809
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 11 17:28:33 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jul 11 17:28:33 2013 +0200
Revert "Use linked frameworks as a source of include directories."
This reverts commit 4fb8ace00d835a81d9279818c62b02eaa2cf59b2.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index e360a3d..a90fa74 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3206,29 +3206,6 @@ 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 912c680..efecd03 100644
--- a/Tests/ExportImport/Export/CMakeLists.txt
+++ b/Tests/ExportImport/Export/CMakeLists.txt
@@ -280,9 +280,6 @@ 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
deleted file mode 100644
index 9eeda7c..0000000
--- a/Tests/ExportImport/Export/testLib4.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#define TESTLIB4_H
diff --git a/Tests/ExportImport/Import/A/CMakeLists.txt b/Tests/ExportImport/Import/A/CMakeLists.txt
index a02ad39..3bfbc46 100644
--- a/Tests/ExportImport/Import/A/CMakeLists.txt
+++ b/Tests/ExportImport/Import/A/CMakeLists.txt
@@ -200,10 +200,6 @@ 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
deleted file mode 100644
index 0e00655..0000000
--- a/Tests/ExportImport/Import/A/framework_interface/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-
-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
deleted file mode 100644
index 357f64f..0000000
--- a/Tests/ExportImport/Import/A/framework_interface/framework_test.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#include <testLib4/testLib4.h>
-
-#ifndef TESTLIB4_H
-#error Expected define TESTLIB4_H
-#endif
-----------------------------------------------------------------------
Summary of changes:
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 -----
6 files changed, 0 insertions(+), 47 deletions(-)
delete mode 100644 Tests/ExportImport/Export/testLib4.h
delete mode 100644 Tests/ExportImport/Import/A/framework_interface/CMakeLists.txt
delete mode 100644 Tests/ExportImport/Import/A/framework_interface/framework_test.cpp
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list