diff options
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/VS10Project/CustomCommandParallel-check.cmake | 24 |
2 files changed, 19 insertions, 6 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 6806a5b..239748d 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -270,6 +270,7 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule() cc->SetComment(comment.c_str()); cc->SetEscapeOldStyle(false); cc->SetStdPipesUTF8(true); + cc->SetUsesTerminal(true); this->AddCustomCommandToOutput(std::move(cc), true); if (cmSourceFile* file = this->Makefile->GetSource(makefileIn)) { // Finalize the source file path now since we're adding this after diff --git a/Tests/RunCMake/VS10Project/CustomCommandParallel-check.cmake b/Tests/RunCMake/VS10Project/CustomCommandParallel-check.cmake index 87e2f70..4c8ad00 100644 --- a/Tests/RunCMake/VS10Project/CustomCommandParallel-check.cmake +++ b/Tests/RunCMake/VS10Project/CustomCommandParallel-check.cmake @@ -6,24 +6,30 @@ endif() set(found_CustomBuild_cmp0147_new 0) set(found_CustomBuild_cmp0147_old 0) +set(found_CustomBuild_CMakeLists 0) set(found_BuildInParallel_cmp0147_new 0) set(found_BuildInParallel_cmp0147_old 0) -set(in_CustomBuild_cmp0147 "") +set(found_BuildInParallel_CMakeLists 0) +set(in_CustomBuild "") file(STRINGS "${vcProjectFile}" lines) foreach(line IN LISTS lines) if(line MATCHES [[<CustomBuild Include=".*\\cmp0147-old\.txt\.rule">]]) set(found_CustomBuild_cmp0147_old 1) - set(in_CustomBuild_cmp0147 "old") + set(in_CustomBuild "cmp0147_old") endif() if(line MATCHES [[<CustomBuild Include=".*\\cmp0147-new\.txt\.rule">]]) set(found_CustomBuild_cmp0147_new 1) - set(in_CustomBuild_cmp0147 "new") + set(in_CustomBuild "cmp0147_new") + endif() + if(line MATCHES [[<CustomBuild Include=".*\\CMakeLists\.txt">]]) + set(found_CustomBuild_CMakeLists 1) + set(in_CustomBuild "CMakeLists") endif() if(line MATCHES [[</CustomBuild>]]) - set(in_CustomBuild_cmp0147 "") + set(in_CustomBuild "") endif() - if(line MATCHES [[<BuildInParallel .*>true</BuildInParallel>]] AND in_CustomBuild_cmp0147) - set(found_BuildInParallel_cmp0147_${in_CustomBuild_cmp0147} 1) + if(line MATCHES [[<BuildInParallel .*>true</BuildInParallel>]] AND in_CustomBuild) + set(found_BuildInParallel_${in_CustomBuild} 1) endif() endforeach() if(NOT found_CustomBuild_cmp0147_new) @@ -32,9 +38,15 @@ endif() if(NOT found_CustomBuild_cmp0147_old) string(APPEND RunCMake_TEST_FAILED "CustomBuild for cmp0147-old.txt.rule not found in\n ${vcProjectFile}\n") endif() +if(NOT found_CustomBuild_CMakeLists) + string(APPEND RunCMake_TEST_FAILED "CustomBuild for CMakeLists.txt not found in\n ${vcProjectFile}\n") +endif() if(NOT found_BuildInParallel_cmp0147_new) string(APPEND RunCMake_TEST_FAILED "BuildInParallel for cmp0147-new.txt.rule not found in\n ${vcProjectFile}\n") endif() if(found_BuildInParallel_cmp0147_old) string(APPEND RunCMake_TEST_FAILED "BuildInParallel for cmp0147-old.txt.rule incorrectly found in\n ${vcProjectFile}\n") endif() +if(found_BuildInParallel_CMakeLists) + string(APPEND RunCMake_TEST_FAILED "BuildInParallel for CMakeLists.txt incorrectly found in\n ${vcProjectFile}\n") +endif() |