diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-08 12:28:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-08 12:28:46 (GMT) |
| commit | fc3f932e3c9c6d897905bb99fdf1a2edc721b168 (patch) | |
| tree | 04436b98b461b9f86b17bba30f718b5320e1a5cf /Tests/RunCMake | |
| parent | 6e44bd186cdc05b388983864903889420f407dbe (diff) | |
| parent | 2f383d852d8d946a61419fe5f4b5c8501216dae9 (diff) | |
| download | CMake-fc3f932e3c9c6d897905bb99fdf1a2edc721b168.zip CMake-fc3f932e3c9c6d897905bb99fdf1a2edc721b168.tar.gz CMake-fc3f932e3c9c6d897905bb99fdf1a2edc721b168.tar.bz2 | |
Merge topic 'languageStandardMultipleBacktraceSupport'
2f383d852d fileapi: Support multiple backtraces for language standard
cc96fb617b Add BTs helper to support multiple backtraces
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4960
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_standard_compile_feature_exe_languagestandard.json | 18 | ||||
| -rw-r--r-- | Tests/RunCMake/FileAPI/cxx/CMakeLists.txt | 1 |
2 files changed, 17 insertions, 2 deletions
diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_standard_compile_feature_exe_languagestandard.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_standard_compile_feature_exe_languagestandard.json index 57b4161..0c4eabb 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_standard_compile_feature_exe_languagestandard.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_standard_compile_feature_exe_languagestandard.json @@ -15,8 +15,22 @@ "command": null, "hasParent": false } + ], + [ + { + "file": "^cxx/CMakeLists\\.txt$", + "line": 30, + "command": "target_compile_features", + "hasParent": true + }, + { + "file": "^cxx/CMakeLists\\.txt$", + "line": null, + "command": null, + "hasParent": false + } ] - ], - "standard" : "11" + ], + "standard" : "11" } } diff --git a/Tests/RunCMake/FileAPI/cxx/CMakeLists.txt b/Tests/RunCMake/FileAPI/cxx/CMakeLists.txt index 5758cc4..76235f5 100644 --- a/Tests/RunCMake/FileAPI/cxx/CMakeLists.txt +++ b/Tests/RunCMake/FileAPI/cxx/CMakeLists.txt @@ -27,5 +27,6 @@ add_executable(cxx_standard_compile_feature_exe ../empty.cxx) set_property(TARGET cxx_standard_compile_feature_exe PROPERTY CXX_STANDARD 98) if(CMAKE_CXX_STANDARD_DEFAULT AND DEFINED CMAKE_CXX11_STANDARD_COMPILE_OPTION) target_compile_features(cxx_standard_compile_feature_exe PRIVATE cxx_std_11) + target_compile_features(cxx_standard_compile_feature_exe PRIVATE cxx_decltype) file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cxx_std_11.txt" "") endif() |