|
@@ -21,7 +21,6 @@
|
|
|
|
|
|
#include "cmEvaluatedTargetProperty.h"
|
|
|
#include "cmGeneratorExpressionDAGChecker.h"
|
|
|
-#include "cmGlobalGenerator.h"
|
|
|
#include "cmList.h"
|
|
|
#include "cmListFileCache.h"
|
|
|
#include "cmLocalGenerator.h"
|
|
@@ -241,9 +240,7 @@ std::vector<BT<std::string>> cmGeneratorTarget::GetCompileOptions(
|
|
|
bool debugOptions = !this->DebugCompileOptionsDone &&
|
|
|
cm::contains(debugProperties, "COMPILE_OPTIONS");
|
|
|
|
|
|
- if (this->GlobalGenerator->GetConfigureDoneCMP0026()) {
|
|
|
- this->DebugCompileOptionsDone = true;
|
|
|
- }
|
|
|
+ this->DebugCompileOptionsDone = true;
|
|
|
|
|
|
EvaluatedTargetPropertyEntries entries = EvaluateTargetPropertyEntries(
|
|
|
this, config, language, &dagChecker, this->CompileOptionsEntries);
|
|
@@ -282,9 +279,7 @@ std::vector<BT<std::string>> cmGeneratorTarget::GetCompileFeatures(
|
|
|
bool debugFeatures = !this->DebugCompileFeaturesDone &&
|
|
|
cm::contains(debugProperties, "COMPILE_FEATURES");
|
|
|
|
|
|
- if (this->GlobalGenerator->GetConfigureDoneCMP0026()) {
|
|
|
- this->DebugCompileFeaturesDone = true;
|
|
|
- }
|
|
|
+ this->DebugCompileFeaturesDone = true;
|
|
|
|
|
|
EvaluatedTargetPropertyEntries entries = EvaluateTargetPropertyEntries(
|
|
|
this, config, std::string(), &dagChecker, this->CompileFeaturesEntries);
|
|
@@ -333,9 +328,7 @@ std::vector<BT<std::string>> cmGeneratorTarget::GetCompileDefinitions(
|
|
|
bool debugDefines = !this->DebugCompileDefinitionsDone &&
|
|
|
cm::contains(debugProperties, "COMPILE_DEFINITIONS");
|
|
|
|
|
|
- if (this->GlobalGenerator->GetConfigureDoneCMP0026()) {
|
|
|
- this->DebugCompileDefinitionsDone = true;
|
|
|
- }
|
|
|
+ this->DebugCompileDefinitionsDone = true;
|
|
|
|
|
|
EvaluatedTargetPropertyEntries entries = EvaluateTargetPropertyEntries(
|
|
|
this, config, language, &dagChecker, this->CompileDefinitionsEntries);
|
|
@@ -397,9 +390,7 @@ std::vector<BT<std::string>> cmGeneratorTarget::GetPrecompileHeaders(
|
|
|
std::find(debugProperties.begin(), debugProperties.end(),
|
|
|
"PRECOMPILE_HEADERS") != debugProperties.end();
|
|
|
|
|
|
- if (this->GlobalGenerator->GetConfigureDoneCMP0026()) {
|
|
|
- this->DebugPrecompileHeadersDone = true;
|
|
|
- }
|
|
|
+ this->DebugPrecompileHeadersDone = true;
|
|
|
|
|
|
EvaluatedTargetPropertyEntries entries = EvaluateTargetPropertyEntries(
|
|
|
this, config, language, &dagChecker, this->PrecompileHeadersEntries);
|
|
@@ -454,9 +445,7 @@ std::vector<BT<std::string>> cmGeneratorTarget::GetLinkOptions(
|
|
|
bool debugOptions = !this->DebugLinkOptionsDone &&
|
|
|
cm::contains(debugProperties, "LINK_OPTIONS");
|
|
|
|
|
|
- if (this->GlobalGenerator->GetConfigureDoneCMP0026()) {
|
|
|
- this->DebugLinkOptionsDone = true;
|
|
|
- }
|
|
|
+ this->DebugLinkOptionsDone = true;
|
|
|
|
|
|
EvaluatedTargetPropertyEntries entries = EvaluateTargetPropertyEntries(
|
|
|
this, config, language, &dagChecker, this->LinkOptionsEntries);
|