[Cmake-commits] CMake branch, next, updated. v2.8.6-2052-gc68b527
Stephen Kelly
steveire at gmail.com
Mon Nov 28 10:57:07 EST 2011
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 c68b52707b3cab82686b24a44db8749a059de309 (commit)
via 9318de99b623702ba914601547a6fbce91affa43 (commit)
from 3bb3ae85f5a565827916aea82b8b0a04a7351e6a (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=c68b52707b3cab82686b24a44db8749a059de309
commit c68b52707b3cab82686b24a44db8749a059de309
Merge: 3bb3ae8 9318de9
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Nov 28 10:56:59 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 28 10:56:59 2011 -0500
Merge topic 'revert-target-include-directories' into next
9318de9 Revert merge of this feature into next.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9318de99b623702ba914601547a6fbce91affa43
commit 9318de99b623702ba914601547a6fbce91affa43
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Nov 28 16:54:03 2011 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Nov 28 16:55:41 2011 +0100
Revert merge of this feature into next.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 5f7f948..ffbeb48 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -574,11 +574,7 @@ void cmLocalGenerator::AddCustomCommandToCreateObject(const char* ofname,
std::string flags;
flags += this->Makefile->GetSafeDefinition(varString.c_str());
flags += " ";
- {
- std::vector<std::string> includes;
- this->GetIncludeDirectories(includes, lang);
- flags += this->GetIncludeFlags(includes, lang);
- }
+ flags += this->GetIncludeFlags(lang);
flags += this->Makefile->GetDefineFlags();
// Construct the command lines.
@@ -1196,8 +1192,8 @@ cmLocalGenerator::ConvertToIncludeReference(std::string const& path)
}
//----------------------------------------------------------------------------
-const char* cmLocalGenerator::GetIncludeFlags(const std::vector<std::string> &includes,
- const char* lang, bool forResponseFile)
+const char* cmLocalGenerator::GetIncludeFlags(const char* lang,
+ bool forResponseFile)
{
if(!lang)
{
@@ -1207,12 +1203,13 @@ const char* cmLocalGenerator::GetIncludeFlags(const std::vector<std::string> &in
key += forResponseFile? "@" : "";
if(this->LanguageToIncludeFlags.count(key))
{
- // Introduced to cmLocalUnixMakefileGenerator in 692ba48c4e5762b370f2999e902b8bd677c77161
- // It seems to just be memoization. Can it be removed?
-// return this->LanguageToIncludeFlags[key].c_str();
+ return this->LanguageToIncludeFlags[key].c_str();
}
cmOStringStream includeFlags;
+ std::vector<std::string> includes;
+ this->GetIncludeDirectories(includes, lang);
+ std::vector<std::string>::iterator i;
std::string flagVar = "CMAKE_INCLUDE_FLAG_";
flagVar += lang;
@@ -1254,7 +1251,6 @@ const char* cmLocalGenerator::GetIncludeFlags(const std::vector<std::string> &in
#ifdef __APPLE__
emitted.insert("/System/Library/Frameworks");
#endif
- std::vector<std::string>::const_iterator i;
for(i = includes.begin(); i != includes.end(); ++i)
{
if(this->Makefile->IsOn("APPLE")
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 7e737ef..0c5b9d0 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -146,8 +146,8 @@ public:
///! Append flags to a string.
virtual void AppendFlags(std::string& flags, const char* newFlags);
///! Get the include flags for the current makefile and language
- const char* GetIncludeFlags(const std::vector<std::string> &includes,
- const char* lang, bool forResponseFile = false);
+ const char* GetIncludeFlags(const char* lang,
+ bool forResponseFile = false);
/**
* Encode a list of preprocessor definitions for the compiler
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 36465b5..8b91194 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -275,7 +275,7 @@ std::string cmMakefileTargetGenerator::GetFlags(const std::string &l)
// Add shared-library flags if needed.
this->LocalGenerator->AddSharedFlags(flags, lang, shared);
- // Add include directory and target include flags.
+ // Add include directory flags.
this->AddIncludeFlags(flags, lang);
// Append old-style preprocessor definition flags.
@@ -1812,13 +1812,8 @@ void cmMakefileTargetGenerator::AddIncludeFlags(std::string& flags,
responseVar += "_USE_RESPONSE_FILE_FOR_INCLUDES";
bool useResponseFile = this->Makefile->IsOn(responseVar.c_str());
-
- std::vector<std::string> includes;
- this->LocalGenerator->GetIncludeDirectories(includes, lang);
- this->Target->GetIncludeDirectories(includes, this->ConfigName);
-
std::string includeFlags =
- this->LocalGenerator->GetIncludeFlags(includes, lang, useResponseFile);
+ this->LocalGenerator->GetIncludeFlags(lang, useResponseFile);
if(includeFlags.empty())
{
return;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index d6bd255..dad0353 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1238,12 +1238,6 @@ void cmTarget::SetMakefile(cmMakefile* mf)
// Save the backtrace of target construction.
this->Makefile->GetBacktrace(this->Internal->Backtrace);
- // Initialize the list of include directories
- std::vector<std::string> makefileIncludes =
- this->Makefile->GetIncludeDirectories();
- this->IncludeDirectories.insert(this->IncludeDirectories.end(),
- makefileIncludes.begin(), makefileIncludes.end());
-
// Record current policies for later use.
this->PolicyStatusCMP0003 =
this->Makefile->GetPolicyStatus(cmPolicies::CMP0003);
@@ -2281,22 +2275,6 @@ void cmTarget::SetProperty(const char* prop, const char* value)
return;
}
- if(strcmp(prop,"INCLUDE_DIRECTORIES") == 0)
- {
- std::vector<std::string> newIncludes;
- cmSystemTools::ExpandListArgument(value, newIncludes);
- this->IncludeDirectories = newIncludes;
- return;
- }
- if(strncmp(prop,"INCLUDE_DIRECTORIES_", 20) == 0)
- {
- std::string configName = prop + 20;
- std::vector<std::string> newIncludes;
- cmSystemTools::ExpandListArgument(value, newIncludes);
- this->ConfigDirectories[configName] = newIncludes;
- return;
- }
-
this->Properties.SetProperty(prop, value, cmProperty::TARGET);
this->MaybeInvalidatePropertyCache(prop);
}
@@ -2309,26 +2287,6 @@ void cmTarget::AppendProperty(const char* prop, const char* value,
{
return;
}
-
- if(strcmp(prop,"INCLUDE_DIRECTORIES") == 0)
- {
- std::vector<std::string> newIncludes;
- cmSystemTools::ExpandListArgument(value, newIncludes);
- this->IncludeDirectories.insert(this->IncludeDirectories.end(),
- newIncludes.begin(), newIncludes.end());
- return;
- }
- if(strncmp(prop,"INCLUDE_DIRECTORIES_", 20) == 0)
- {
- std::string configName = prop + 20;
- std::vector<std::string> newIncludes;
- cmSystemTools::ExpandListArgument(value, newIncludes);
- this->ConfigDirectories[configName].insert(
- this->ConfigDirectories[configName].end(),
- newIncludes.begin(), newIncludes.end());
- return;
- }
-
this->Properties.AppendProperty(prop, value, cmProperty::TARGET, asString);
this->MaybeInvalidatePropertyCache(prop);
}
@@ -2730,45 +2688,6 @@ const char *cmTarget::GetProperty(const char* prop,
this->SetProperty("SOURCES", ss.str().c_str());
}
- if(strcmp(prop,"INCLUDE_DIRECTORIES") == 0)
- {
- cmOStringStream str;
- for (std::vector<std::string>::const_iterator
- it = this->IncludeDirectories.begin();
- it != this->IncludeDirectories.end();
- ++ it )
- {
- if ( it != this->IncludeDirectories.begin())
- {
- str << ";";
- }
- str << it->c_str();
- }
- std::string output = str.str();
- return output.c_str();
- }
- if(strncmp(prop,"INCLUDE_DIRECTORIES_", 20) == 0)
- {
- std::string configName = prop + 20;
- std::vector<std::string> ConfigIncludeDirectories =
- this->ConfigDirectories[configName];
-
- cmOStringStream str;
- for (std::vector<std::string>::const_iterator
- it = ConfigIncludeDirectories.begin();
- it != ConfigIncludeDirectories.end();
- ++ it )
- {
- if ( it != ConfigIncludeDirectories.begin())
- {
- str << ";";
- }
- str << it->c_str();
- }
- std::string output = str.str();
- return output.c_str();
- }
-
// the type property returns what type the target is
if (!strcmp(prop,"TYPE"))
{
@@ -4709,33 +4628,6 @@ cmTarget::GetLinkInformation(const char* config)
return i->second;
}
-void cmTarget::GetIncludeDirectories(std::vector<std::string> &includes, const char* config)
-{
- std::vector<std::string> targetIncludes;
-
- targetIncludes.insert(targetIncludes.end(), this->IncludeDirectories.begin(), this->IncludeDirectories.end());
-
- std::string configName = cmSystemTools::UpperCase(config);
- std::vector<std::string> configIncludes = this->ConfigDirectories[configName];
- targetIncludes.insert(targetIncludes.end(), configIncludes.begin(), configIncludes.end());
-
- std::set<cmStdString> emitted;
- for(std::vector<std::string>::const_iterator
- li = includes.begin(); li != includes.end(); ++li)
- {
- emitted.insert(*li);
- }
-
- for(std::vector<std::string>::const_iterator
- li = targetIncludes.begin(); li != targetIncludes.end(); ++li)
- {
- if (emitted.insert(*li).second)
- {
- includes.push_back(*li);
- }
- }
-}
-
//----------------------------------------------------------------------------
cmTargetLinkInformationMap
::cmTargetLinkInformationMap(cmTargetLinkInformationMap const& r): derived()
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 2306c71..0abdddb 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -450,8 +450,6 @@ public:
directory. */
bool UsesDefaultOutputDir(const char* config, bool implib);
- void GetIncludeDirectories(std::vector<std::string> &includes, const char *config);
-
private:
/**
* A list of direct dependencies. Use in conjunction with DependencyMap.
@@ -560,8 +558,6 @@ private:
LinkLibraryVectorType OriginalLinkLibraries;
bool DLLPlatform;
bool IsImportedTarget;
- std::vector<std::string> IncludeDirectories;
- std::map<cmStdString, std::vector<std::string> > ConfigDirectories;
// Cache target output paths for each configuration.
struct OutputInfo;
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index c4780f4..d691f46 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -605,10 +605,7 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
mf->AddIncludeDirectory(dirIt->c_str(), false);
}
- std::vector<std::string> includeDirectories;
- lg->GetIncludeDirectories(includeDirectories, language.c_str());
- std::string includeFlags = lg->GetIncludeFlags(includeDirectories, language.c_str(), false);
-
+ std::string includeFlags = lg->GetIncludeFlags(language.c_str(), false);
std::string definitions = mf->GetSafeDefinition("PACKAGE_DEFINITIONS");
printf("%s %s\n", includeFlags.c_str(), definitions.c_str());
}
diff --git a/Tests/IncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/CMakeLists.txt
index 60f5e5e..60b8c22 100644
--- a/Tests/IncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/CMakeLists.txt
@@ -45,5 +45,3 @@ else()
set_target_properties(IncludeDirectories
PROPERTIES COMPILE_FLAGS "-ITarProp")
endif()
-
-add_subdirectory(TargetIncludeDirectories)
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
deleted file mode 100644
index 834b308..0000000
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-cmake_minimum_required(VERSION 2.8)
-
-project(TargetIncludeDirectories)
-
-macro(create_header _name)
- file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${_name}")
- file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/${_name}/${_name}.h"
- "//${_name}.h
- ")
-endmacro()
-
-create_header(bar)
-create_header(bat)
-create_header(foo)
-create_header(baz)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-include_directories("${CMAKE_CURRENT_BINARY_DIR}/bar")
-
-add_executable(TargetIncludeDirectories main.cpp)
-set_target_properties(TargetIncludeDirectories PROPERTIES INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/bat")
-set_property(TARGET TargetIncludeDirectories APPEND PROPERTY INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/foo")
-
-include_directories("${CMAKE_CURRENT_BINARY_DIR}/baz")
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp b/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp
deleted file mode 100644
index 8aa3532..0000000
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#include "bar.h"
-#include "bat.h"
-#include "foo.h"
-#include "baz.h"
-
-int main(int, char**)
-{
- return 0;
-}
-----------------------------------------------------------------------
Summary of changes:
Source/cmLocalGenerator.cxx | 18 ++--
Source/cmLocalGenerator.h | 4 +-
Source/cmMakefileTargetGenerator.cxx | 9 +--
Source/cmTarget.cxx | 108 --------------------
Source/cmTarget.h | 4 -
Source/cmake.cxx | 5 +-
Tests/IncludeDirectories/CMakeLists.txt | 2 -
.../TargetIncludeDirectories/CMakeLists.txt | 26 -----
.../TargetIncludeDirectories/main.cpp | 10 --
9 files changed, 12 insertions(+), 174 deletions(-)
delete mode 100644 Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
delete mode 100644 Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list