diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-23 14:30:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-07-23 14:54:35 (GMT) |
| commit | c4109a1bc88f8e3b4ff93de6b784ab57149546bc (patch) | |
| tree | fbcb0b8234099dcfa2f16c92705bd22d54e074bc /Tests/SetLang/CMakeLists.txt | |
| parent | d421274e3e11a0e6480358faa8a8e5cf48d7b3c2 (diff) | |
| download | CMake-c4109a1bc88f8e3b4ff93de6b784ab57149546bc.zip CMake-c4109a1bc88f8e3b4ff93de6b784ab57149546bc.tar.gz CMake-c4109a1bc88f8e3b4ff93de6b784ab57149546bc.tar.bz2 | |
VS: Restore toleration of target-wide -TP flag with MSVC
Since commit 3b547e2e4b (VS: Simplify logic adding source file C/C++
language flag to MSVC, 2020-05-15, v3.18.0-rc1~139^2~1) we only add a
per-source language selection flag when the source file extension does
not match the compiler's default. This approach breaks when a project
adds a target-wide `-TP` flag.
Although such projects likely did not work with non-VS generators, we
did support them before in Visual Studio generators. Add a special case
to tolerate such flags again.
Fixes: #21005
Diffstat (limited to 'Tests/SetLang/CMakeLists.txt')
| -rw-r--r-- | Tests/SetLang/CMakeLists.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Tests/SetLang/CMakeLists.txt b/Tests/SetLang/CMakeLists.txt index f24e5cb..9de4fc6 100644 --- a/Tests/SetLang/CMakeLists.txt +++ b/Tests/SetLang/CMakeLists.txt @@ -8,3 +8,10 @@ add_executable(SetLang bar.c) set_source_files_properties(foo.c bar.c PROPERTIES LANGUAGE CXX) target_link_libraries(SetLang foo) set_target_properties(SetLang PROPERTIES LINKER_LANGUAGE CXX) + +# VS generators historically tolerated target-wide -TP flags added +# by project code, so cover that case to preserve the behavior. +if(CMAKE_GENERATOR MATCHES "^Visual Studio" AND "x${CMAKE_C_COMPILER_ID}" STREQUAL "xMSVC") + add_library(stay stay_c.c stay_cxx.cxx) + set_property(TARGET stay PROPERTY COMPILE_OPTIONS "-TP") +endif() |