kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make subclasses responsible for joining content. 

This way we can add handling of relative/absolute paths and of
-D in compile definitions.
This commit is contained in:
Stephen Kelly 2013-01-29 17:23:31 +01:00
parent f6b16d4b06
commit 7bf490e9bb
11 changed files with 89 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Source/cmTargetCompileDefinitionsCommand.cxx
View File

@ -37,9 +37,32 @@ void cmTargetCompileDefinitionsCommand
this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
}
//----------------------------------------------------------------------------
std::string cmTargetCompileDefinitionsCommand
::Join(const std::vector<std::string> &content)
{
std::string defs;
std::string sep;
for(std::vector<std::string>::const_iterator it = content.begin();
it != content.end(); ++it)
{
if (strncmp(it->c_str(), "-D", 2) == 0)
{
defs += sep + it->substr(2);
}
else
{
defs += sep + *it;
}
sep = ";";
}
return defs;
}
//----------------------------------------------------------------------------
void cmTargetCompileDefinitionsCommand
::HandleDirectContent(cmTarget *tgt, const std::string &content,
::HandleDirectContent(cmTarget *tgt, const std::vector<std::string> &content,
bool)
{
tgt->AppendProperty("COMPILE_DEFINITIONS", content.c_str());
tgt->AppendProperty("COMPILE_DEFINITIONS", this->Join(content).c_str());
}

4
Source/cmTargetCompileDefinitionsCommand.h
View File

@ -81,8 +81,10 @@ private:
virtual void HandleImportedTarget(const std::string &tgt);
virtual void HandleMissingTarget(const std::string &name);
virtual void HandleDirectContent(cmTarget *tgt, const std::string &content,
virtual void HandleDirectContent(cmTarget *tgt,
const std::vector<std::string> &content,
bool prepend);
virtual std::string Join(const std::vector<std::string> &content);
};
#endif

36
Source/cmTargetIncludeDirectoriesCommand.cxx
View File

@ -40,13 +40,45 @@ void cmTargetIncludeDirectoriesCommand
this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
}
//----------------------------------------------------------------------------
static bool isGeneratorExpression(const std::string &lib)
{
const std::string::size_type openpos = lib.find("$<");
return (openpos != std::string::npos)
&& (lib.find(">", openpos) != std::string::npos);
}
//----------------------------------------------------------------------------
std::string cmTargetIncludeDirectoriesCommand
::Join(const std::vector<std::string> &content)
{
std::string dirs;
std::string sep;
std::string prefix = this->Makefile->GetStartDirectory() + std::string("/");
for(std::vector<std::string>::const_iterator it = content.begin();
it != content.end(); ++it)
{
if (cmSystemTools::FileIsFullPath(it->c_str())
|| isGeneratorExpression(*it))
{
dirs += sep + *it;
}
else
{
dirs += sep + prefix + *it;
}
sep = ";";
}
return dirs;
}
//----------------------------------------------------------------------------
void cmTargetIncludeDirectoriesCommand
::HandleDirectContent(cmTarget *tgt, const std::string &content,
::HandleDirectContent(cmTarget *tgt, const std::vector<std::string> &content,
bool prepend)
{
cmListFileBacktrace lfbt;
this->Makefile->GetBacktrace(lfbt);
cmMakefileIncludeDirectoriesEntry entry(content, lfbt);
cmMakefileIncludeDirectoriesEntry entry(this->Join(content), lfbt);
tgt->InsertInclude(entry, prepend);
}

4
Source/cmTargetIncludeDirectoriesCommand.h
View File

@ -85,8 +85,10 @@ private:
virtual void HandleImportedTarget(const std::string &tgt);
virtual void HandleMissingTarget(const std::string &name);
virtual void HandleDirectContent(cmTarget *tgt, const std::string &content,
virtual void HandleDirectContent(cmTarget *tgt,
const std::vector<std::string> &content,
bool prepend);
virtual std::string Join(const std::vector<std::string> &content);
};
#endif

13
Source/cmTargetPropCommandBase.cxx
View File

@ -88,9 +88,8 @@ bool cmTargetPropCommandBase
++argIndex;
std::string content;
std::vector<std::string> content;
std::string sep;
for(unsigned int i=argIndex; i < args.size(); ++i, ++argIndex)
{
if(args[i] == "PUBLIC"
@ -100,8 +99,7 @@ bool cmTargetPropCommandBase
this->PopulateTargetProperies(scope, content, prepend);
return true;
}
content += sep + args[i];
sep = ";";
content.push_back(args[i]);
}
this->PopulateTargetProperies(scope, content, prepend);
return true;
@ -110,7 +108,8 @@ bool cmTargetPropCommandBase
//----------------------------------------------------------------------------
void cmTargetPropCommandBase
::PopulateTargetProperies(const std::string &scope,
const std::string &content, bool prepend)
const std::vector<std::string> &content,
bool prepend)
{
if (scope == "PRIVATE" || scope == "PUBLIC")
{
@ -122,7 +121,7 @@ void cmTargetPropCommandBase
{
const std::string propName = std::string("INTERFACE_") + this->Property;
const char *propValue = this->Target->GetProperty(propName.c_str());
const std::string totalContent = content + (propValue
const std::string totalContent = this->Join(content) + (propValue
? std::string(";") + propValue
: std::string());
this->Target->SetProperty(propName.c_str(), totalContent.c_str());
@ -130,7 +129,7 @@ void cmTargetPropCommandBase
else
{
this->Target->AppendProperty(("INTERFACE_" + this->Property).c_str(),
content.c_str());
this->Join(content).c_str());
}
}
}

10
Source/cmTargetPropCommandBase.h
View File

@ -33,22 +33,22 @@ public:
protected:
std::string Property;
cmTarget *Target;
private:
virtual void HandleImportedTarget(const std::string &tgt) = 0;
virtual void HandleMissingTarget(const std::string &name) = 0;
virtual void HandleDirectContent(cmTarget *tgt,
const std::string &content,
const std::vector<std::string> &content,
bool prepend) = 0;
virtual std::string Join(const std::vector<std::string> &content) = 0;
bool ProcessContentArgs(std::vector<std::string> const& args,
unsigned int &argIndex, bool prepend);
void PopulateTargetProperies(const std::string &scope,
const std::string &content, bool prepend);
private:
cmTarget *Target;
const std::vector<std::string> &content,
bool prepend);
};
#endif

1
Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt
View File

@ -20,4 +20,5 @@ target_compile_definitions(consumer
PRIVATE $<TARGET_PROPERTY:target_compile_definitions,INTERFACE_COMPILE_DEFINITIONS>
$<$<TARGET_DEFINED:notdefined>:SHOULD_NOT_BE_DEFINED>
$<$<TARGET_DEFINED:target_compile_definitions>:SHOULD_BE_DEFINED>
-DDASH_D_DEFINE
)

4
Tests/CMakeCommands/target_compile_definitions/consumer.cpp
View File

@ -19,4 +19,8 @@
#error Expected SHOULD_BE_DEFINED
#endif
#ifndef DASH_D_DEFINE
#error Expected DASH_D_DEFINE
#endif
int main() { return 0; }

1
Tests/CMakeCommands/target_include_directories/CMakeLists.txt
View File

@ -44,4 +44,5 @@ add_executable(consumer
target_include_directories(consumer
PRIVATE $<TARGET_PROPERTY:target_include_directories,INTERFACE_INCLUDE_DIRECTORIES>
relative_dir
)

5
Tests/CMakeCommands/target_include_directories/consumer.cpp
View File

@ -2,6 +2,7 @@
#include "common.h"
#include "publicinclude.h"
#include "interfaceinclude.h"
#include "relative_dir.h"
#ifdef PRIVATEINCLUDE_DEFINE
#error Unexpected PRIVATEINCLUDE_DEFINE
@ -19,4 +20,8 @@
#error Expected CURE_DEFINE
#endif
#ifndef RELATIVE_DIR_DEFINE
#error Expected RELATIVE_DIR_DEFINE
#endif
int main() { return 0; }

2
Tests/CMakeCommands/target_include_directories/relative_dir/relative_dir.h Normal file
View File

@ -0,0 +1,2 @@
#define RELATIVE_DIR_DEFINE