[Cmake-commits] CMake branch, next, updated. v3.3.1-3005-gf1591ef
Gregor Jasny
gjasny at googlemail.com
Wed Sep 16 15:34:11 EDT 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, next has been updated
via f1591efe91e174c878a87d4f3b8d0b7152c81ef6 (commit)
via 02633f3aa982356157964bbc9ebe8eb176e69b93 (commit)
via 5b4649c63fbc291a74823e9eeaa1721c1a10b004 (commit)
from feeb443eb738676b104d04982cbc5d6e1d0e149e (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=f1591efe91e174c878a87d4f3b8d0b7152c81ef6
commit f1591efe91e174c878a87d4f3b8d0b7152c81ef6
Merge: feeb443 02633f3
Author: Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Wed Sep 16 15:34:10 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 16 15:34:10 2015 -0400
Merge topic 'xcode-support-system-include' into next
02633f3a Revert "Xcode: Obey SYSTEM keyword for includes (#15687)"
5b4649c6 Revert "Swift: Add includes to OTHER_SWIFT_FLAGS in Xcode"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02633f3aa982356157964bbc9ebe8eb176e69b93
commit 02633f3aa982356157964bbc9ebe8eb176e69b93
Author: Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Wed Sep 16 21:33:23 2015 +0200
Commit: Gregor Jasny <gjasny at googlemail.com>
CommitDate: Wed Sep 16 21:33:23 2015 +0200
Revert "Xcode: Obey SYSTEM keyword for includes (#15687)"
This reverts commit 40a85b503c9eaa579c5b497f7f7155911f7a67c3.
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index e131ddc..33babec 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2177,27 +2177,34 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
this->CreateString("NO"));
}
- for(std::set<std::string>::iterator li = languages.begin();
- li != languages.end(); ++li)
+ BuildObjectListOrString dirs(this, this->XcodeVersion >= 30);
+ BuildObjectListOrString fdirs(this, this->XcodeVersion >= 30);
+ std::vector<std::string> includes;
+ this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt,
+ "C", configName);
+ std::set<std::string> emitted;
+ emitted.insert("/System/Library/Frameworks");
+ for(std::vector<std::string>::iterator i = includes.begin();
+ i != includes.end(); ++i)
{
- std::vector<std::string> includes;
- this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt, *li);
-
- std::string includeFlags = this->CurrentLocalGenerator
- ->GetIncludeFlags(includes, gtgt, *li, true, false, configName);
-
- std::string& flags = cflags[*li];
-
- if (!includeFlags.empty())
+ if(this->NameResolvesToFramework(i->c_str()))
+ {
+ std::string frameworkDir = *i;
+ frameworkDir += "/../";
+ frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir.c_str());
+ if(emitted.insert(frameworkDir).second)
+ {
+ fdirs.Add(this->XCodeEscapePath(frameworkDir.c_str()).c_str());
+ }
+ }
+ else
{
- flags += " " + includeFlags;
+ std::string incpath =
+ this->XCodeEscapePath(i->c_str());
+ dirs.Add(incpath.c_str());
}
}
-
// Add framework search paths needed for linking.
- BuildObjectListOrString fdirs(this, this->XcodeVersion >= 30);
- std::set<std::string> emitted;
- emitted.insert("/System/Library/Frameworks");
if(cmComputeLinkInformation* cli = gtgt->GetLinkInformation(configName))
{
std::vector<std::string> const& fwDirs = cli->GetFrameworkPaths();
@@ -2215,6 +2222,11 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
buildSettings->AddAttribute("FRAMEWORK_SEARCH_PATHS",
fdirs.CreateList());
}
+ if(!dirs.IsEmpty())
+ {
+ buildSettings->AddAttribute("HEADER_SEARCH_PATHS",
+ dirs.CreateList());
+ }
bool same_gflags = true;
std::map<std::string, std::string> gflags;
diff --git a/Tests/IncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/CMakeLists.txt
index 1a4f43a..9ee1957 100644
--- a/Tests/IncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/CMakeLists.txt
@@ -3,8 +3,7 @@ project(IncludeDirectories)
if (((CMAKE_C_COMPILER_ID STREQUAL GNU AND CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.4)
OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL AppleClang)
- AND (CMAKE_GENERATOR STREQUAL "Unix Makefiles"
- OR CMAKE_GENERATOR STREQUAL "Ninja" OR CMAKE_GENERATOR STREQUAL "Xcode"))
+ AND (CMAKE_GENERATOR STREQUAL "Unix Makefiles" OR CMAKE_GENERATOR STREQUAL "Ninja"))
include(CheckCXXCompilerFlag)
check_cxx_compiler_flag(-Wunused-variable run_sys_includes_test)
if(run_sys_includes_test)
diff --git a/Tests/IncludeDirectories/SystemIncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/SystemIncludeDirectories/CMakeLists.txt
index 5078f30..dcee85e 100644
--- a/Tests/IncludeDirectories/SystemIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/SystemIncludeDirectories/CMakeLists.txt
@@ -15,17 +15,10 @@ target_include_directories(upstream SYSTEM PUBLIC
)
add_library(config_specific INTERFACE)
-if(CMAKE_GENERATOR STREQUAL "Xcode")
- # CMAKE_BUILD_TYPE does not work here for multi-config generators
- target_include_directories(config_specific SYSTEM INTERFACE
- "${CMAKE_CURRENT_SOURCE_DIR}/config_specific"
- )
-else()
- set(testConfig ${CMAKE_BUILD_TYPE})
- target_include_directories(config_specific SYSTEM INTERFACE
- "$<$<CONFIG:${testConfig}>:${CMAKE_CURRENT_SOURCE_DIR}/config_specific>"
- )
-endif()
+set(testConfig ${CMAKE_BUILD_TYPE})
+target_include_directories(config_specific SYSTEM INTERFACE
+ "$<$<CONFIG:${testConfig}>:${CMAKE_CURRENT_SOURCE_DIR}/config_specific>"
+)
add_library(consumer consumer.cpp)
target_link_libraries(consumer upstream config_specific)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b4649c63fbc291a74823e9eeaa1721c1a10b004
commit 5b4649c63fbc291a74823e9eeaa1721c1a10b004
Author: Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Wed Sep 16 21:33:21 2015 +0200
Commit: Gregor Jasny <gjasny at googlemail.com>
CommitDate: Wed Sep 16 21:33:21 2015 +0200
Revert "Swift: Add includes to OTHER_SWIFT_FLAGS in Xcode"
This reverts commit c4c34af1a8e951026178db532f18660e0a7f28bf.
diff --git a/Modules/CMakeSwiftInformation.cmake b/Modules/CMakeSwiftInformation.cmake
index 85d3143..61ad928 100644
--- a/Modules/CMakeSwiftInformation.cmake
+++ b/Modules/CMakeSwiftInformation.cmake
@@ -13,7 +13,6 @@
# License text for the above reference.)
set(CMAKE_Swift_OUTPUT_EXTENSION .o)
-set(CMAKE_INCLUDE_FLAG_Swift "-I")
# Load compiler-specific information.
if(CMAKE_Swift_COMPILER_ID)
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index de1e506..e131ddc 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2300,11 +2300,6 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
buildSettings->AddAttribute("OTHER_CFLAGS",
this->CreateString(flags.c_str()));
}
- else if (*li == "Swift")
- {
- buildSettings->AddAttribute("OTHER_SWIFT_FLAGS",
- this->CreateString(flags.c_str()));
- }
}
// Add Fortran source format attribute if property is set.
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeSwiftInformation.cmake | 1 -
Source/cmGlobalXCodeGenerator.cxx | 49 +++++++++++---------
Tests/IncludeDirectories/CMakeLists.txt | 3 +-
.../SystemIncludeDirectories/CMakeLists.txt | 15 ++----
4 files changed, 33 insertions(+), 35 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list