diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-12 10:52:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-12 10:53:41 (GMT) |
| commit | eb2a554b12b4980f76e425bfc720bb170d08e840 (patch) | |
| tree | 9605603c3a8e7d8cf0226d1876e47e78c65ac47e | |
| parent | b049f0af52155d405129f6a6fd0524a88b1839dc (diff) | |
| parent | 6b2fb4ffd2e34093e54db0d5e2dac0fa17eacdf0 (diff) | |
| download | CMake-eb2a554b12b4980f76e425bfc720bb170d08e840.zip CMake-eb2a554b12b4980f76e425bfc720bb170d08e840.tar.gz CMake-eb2a554b12b4980f76e425bfc720bb170d08e840.tar.bz2 | |
Merge topic 'vs-pch-compile-opts'
6b2fb4ffd2 VS: Fix using PCH from source with COMPILE_OPTIONS
Acked-by: Kitware Robot <kwrobot@kitware.com>
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 2b20a00..93c09fe 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2376,7 +2376,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 a1e0792..aab20d8 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) |