diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-11 12:03:45 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-05-11 12:03:45 -0400 |
| commit | 9cd0523a33d22cee8af79d44d54cffdabe526bbc (patch) | |
| tree | 6ecefc977d13ad453b4fdfec2a6b0dd80ae2caed | |
| parent | 68f60c073f676b0cb343c3c0d98183a7ed3287a8 (diff) | |
| parent | 6b2fb4ffd2e34093e54db0d5e2dac0fa17eacdf0 (diff) | |
| download | cmake-9cd0523a33d22cee8af79d44d54cffdabe526bbc.tar.gz | |
Merge branch 'vs-pch-compile-opts' into release-3.16
Merge-request: !4734
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/PrecompileHeaders/PchInterface.cmake | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index f220ea5727..b33cb50a3b 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2345,7 +2345,7 @@ void cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags( pchOptions = this->GeneratorTarget->GetPchUseCompileOptions(config, lang); } - customAndPchOptions += pchOptions; + customAndPchOptions = cmStrCat(customAndPchOptions, ';', pchOptions); } // if we have flags or defines for this config then diff --git a/Tests/RunCMake/PrecompileHeaders/PchInterface.cmake b/Tests/RunCMake/PrecompileHeaders/PchInterface.cmake index a1e0792738..aab20d8f59 100644 --- a/Tests/RunCMake/PrecompileHeaders/PchInterface.cmake +++ b/Tests/RunCMake/PrecompileHeaders/PchInterface.cmake @@ -9,6 +9,9 @@ target_precompile_headers(foo PUBLIC <stdio.h> \"string.h\" ) +if(CMAKE_C_COMPILER_ID STREQUAL "MSVC") + set_property(SOURCE foo.c APPEND PROPERTY COMPILE_OPTIONS "-WX-") +endif() add_library(bar INTERFACE) target_include_directories(bar INTERFACE include) |