reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-04-05 00:31:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VS,Xcode: Fix TARGET_PROPERTY genex in source COMPILE_FLAGS property

Browse Source 
This already worked in other generators.  Also add a test case.

Fixes: #17314
This commit is contained in:
Brad King 2017-10-02 08:25:22 -04:00
parent db730f3e50
commit 303cd7037a
6 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmGlobalXCodeGenerator.cxx
View File

@ -668,7 +668,8 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreateXCodeSourceFile(
std::string configName = "NO-PER-CONFIG-SUPPORT-IN-XCODE"; std::string configName = "NO-PER-CONFIG-SUPPORT-IN-XCODE";
std::unique_ptr<cmCompiledGeneratorExpression> compiledExpr = std::unique_ptr<cmCompiledGeneratorExpression> compiledExpr =
ge.Parse(cflags); ge.Parse(cflags);
const char* processed = compiledExpr->Evaluate(lg, configName); const char* processed =
compiledExpr->Evaluate(lg, configName, false, gtgt);
if (compiledExpr->GetHadContextSensitiveCondition()) { if (compiledExpr->GetHadContextSensitiveCondition()) {
std::ostringstream e; std::ostringstream e;
/* clang-format off */ /* clang-format off */

2
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -1454,7 +1454,7 @@ cmLocalVisualStudio7GeneratorFCInfo::cmLocalVisualStudio7GeneratorFCInfo(
if (const char* cflags = sf.GetProperty("COMPILE_FLAGS")) { if (const char* cflags = sf.GetProperty("COMPILE_FLAGS")) {
cmGeneratorExpression ge; cmGeneratorExpression ge;
std::unique_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(cflags); std::unique_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(cflags);
fc.CompileFlags = cge->Evaluate(lg, *i); fc.CompileFlags = cge->Evaluate(lg, *i, false, gt);
needfc = true; needfc = true;
} }
if (lg->FortranProject) { if (lg->FortranProject) {

4
Source/cmVisualStudio10TargetGenerator.cxx
View File

@ -2125,8 +2125,8 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
if (configDependentFlags) { if (configDependentFlags) {
cmGeneratorExpression ge; cmGeneratorExpression ge;
std::unique_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(flags); std::unique_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(flags);
std::string evaluatedFlags = std::string evaluatedFlags = cge->Evaluate(
cge->Evaluate(this->LocalGenerator, *config); this->LocalGenerator, *config, false, this->GeneratorTarget);
clOptions.Parse(evaluatedFlags.c_str()); clOptions.Parse(evaluatedFlags.c_str());
} else { } else {
clOptions.Parse(flags.c_str()); clOptions.Parse(flags.c_str());

4
Tests/GeneratorExpression/CMakeLists.txt
View File

@ -258,11 +258,13 @@ add_custom_target(check-part4 ALL
VERBATIM VERBATIM
) )
add_executable(srcgenex srcgenex.c)
set_property(SOURCE srcgenex.c PROPERTY COMPILE_FLAGS "-DNAME=$<TARGET_PROPERTY:NAME>")
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Cover test properties with generator expressions. # Cover test properties with generator expressions.
add_executable(echo echo.c) add_executable(echo echo.c)
add_executable(pwd pwd.c) add_executable(pwd pwd.c)
set_property(SOURCE echo.c PROPERTY COMPILE_FLAGS $<1:-DSRC_GENEX_WORKS>)
add_test(NAME echo-configuration COMMAND echo $<CONFIGURATION>) add_test(NAME echo-configuration COMMAND echo $<CONFIGURATION>)
set_property(TEST echo-configuration PROPERTY set_property(TEST echo-configuration PROPERTY

3
Tests/GeneratorExpression/echo.c
View File

@ -3,9 +3,6 @@
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
#ifndef SRC_GENEX_WORKS
#error SRC_GENEX_WORKS not defined
#endif
printf("%s\n", argv[1]); printf("%s\n", argv[1]);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

12
Tests/GeneratorExpression/srcgenex.c Normal file
View File

@ -0,0 +1,12 @@
int srcgenex(void)
{
return 0;
}
int main(int argc, char* argv[])
{
#ifndef NAME
#error NAME not defined
#endif
return NAME();
}