diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-27 14:42:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-27 14:42:44 (GMT) |
| commit | ea8bb8a2a7d491b2fd8d79e98f5b50ca55ab8d70 (patch) | |
| tree | ad9f563b166c72eea8ae9eb975d3995ed1e928a1 /Tests | |
| parent | 11cf196fd2c8eca6427cf65755895641c60fe1fe (diff) | |
| parent | a33a4ec68bbaf8e1a83c4fa241ce77a3634e73d6 (diff) | |
| download | CMake-ea8bb8a2a7d491b2fd8d79e98f5b50ca55ab8d70.zip CMake-ea8bb8a2a7d491b2fd8d79e98f5b50ca55ab8d70.tar.gz CMake-ea8bb8a2a7d491b2fd8d79e98f5b50ca55ab8d70.tar.bz2 | |
Merge topic 'vs-lang-flags'
a33a4ec68b Merge branch 'backport-vs-lang-flags' into vs-lang-flags
c4109a1bc8 VS: Restore toleration of target-wide -TP flag with MSVC
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5051
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/SetLang/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | Tests/SetLang/stay_c.c | 8 | ||||
| -rw-r--r-- | Tests/SetLang/stay_cxx.cxx | 8 |
3 files changed, 23 insertions, 0 deletions
diff --git a/Tests/SetLang/CMakeLists.txt b/Tests/SetLang/CMakeLists.txt index af90f11..616421e 100644 --- a/Tests/SetLang/CMakeLists.txt +++ b/Tests/SetLang/CMakeLists.txt @@ -9,6 +9,13 @@ 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() + if((CMAKE_C_COMPILER_ID MATCHES "(GNU|Clang|MSVC|Borland|Embarcadero|Intel|TI|XL)")) add_library(zoom zoom.zzz) set_source_files_properties(zoom.zzz PROPERTIES LANGUAGE CXX) diff --git a/Tests/SetLang/stay_c.c b/Tests/SetLang/stay_c.c new file mode 100644 index 0000000..70755f3 --- /dev/null +++ b/Tests/SetLang/stay_c.c @@ -0,0 +1,8 @@ +#ifdef __cplusplus +# error C source incorrectly compiled as C++ +#endif + +int stay_c(void) +{ + return 0; +} diff --git a/Tests/SetLang/stay_cxx.cxx b/Tests/SetLang/stay_cxx.cxx new file mode 100644 index 0000000..e035260 --- /dev/null +++ b/Tests/SetLang/stay_cxx.cxx @@ -0,0 +1,8 @@ +#ifndef __cplusplus +# error C++ source incorrectly compiled as C +#endif + +int stay_cxx() +{ + return 0; +} |