Просмотр исходного кода

Merge branch 'include_external_msproject-exclude-from-all' into release-3.14

Merge-request: !3025
Brad King 7 лет назад
Родитель
Сommit
624ce2c8be
1 измененных файлов с 3 добавлено и 1 удалено
  1. 3 1
      Source/cmIncludeExternalMSProjectCommand.cxx

+ 3 - 1
Source/cmIncludeExternalMSProjectCommand.cxx

@@ -85,10 +85,12 @@ bool cmIncludeExternalMSProjectCommand::InitialPass(
     // Create a target instance for this utility.
     cmTarget* target = this->Makefile->AddNewTarget(cmStateEnums::UTILITY,
                                                     utility_name.c_str());
+    if (this->Makefile->GetPropertyAsBool("EXCLUDE_FROM_ALL")) {
+      target->SetProperty("EXCLUDE_FROM_ALL", "TRUE");
+    }
 
     target->SetProperty("GENERATOR_FILE_NAME", utility_name.c_str());
     target->SetProperty("EXTERNAL_MSPROJECT", path.c_str());
-    target->SetProperty("EXCLUDE_FROM_ALL", "FALSE");
 
     if (!customType.empty())
       target->SetProperty("VS_PROJECT_TYPE", customType.c_str());