summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-05-28 19:28:25 (GMT)
committerBrad King <brad.king@kitware.com>2021-05-28 19:41:38 (GMT)
commit316cbbe8d570775eb08683a72808ee07bddcd3e0 (patch)
treef4ef2146549fbb10751807e4d0422c36c83f27af /Tests
parentf4f80cfec6ba4667a2efce8c88d1e3d23f053cdc (diff)
downloadCMake-316cbbe8d570775eb08683a72808ee07bddcd3e0.zip
CMake-316cbbe8d570775eb08683a72808ee07bddcd3e0.tar.gz
CMake-316cbbe8d570775eb08683a72808ee07bddcd3e0.tar.bz2
Makefiles: Fix CMAKE_EXPORT_COMPILE_COMMANDS crash with custom compile rule
Extend the fix from commit 67e2130c96 (Makefiles: Fix CMAKE_EXPORT_COMPILE_COMMANDS crash with custom compile rule, 2020-11-20, v3.19.1~8^2) to work for the `<FLAGS>` placeholder too. Also fix the test case to actually enable `EXPORT_COMPILE_COMMANDS` on the test target. Fixes: #22261
Diffstat (limited to 'Tests')
-rw-r--r--Tests/RunCMake/ExportCompileCommands/CustomCompileRule.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/Tests/RunCMake/ExportCompileCommands/CustomCompileRule.cmake b/Tests/RunCMake/ExportCompileCommands/CustomCompileRule.cmake
index 12368a2..b1b120f 100644
--- a/Tests/RunCMake/ExportCompileCommands/CustomCompileRule.cmake
+++ b/Tests/RunCMake/ExportCompileCommands/CustomCompileRule.cmake
@@ -1,5 +1,6 @@
enable_language(C)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
add_library(empty STATIC empty.c)
string(REPLACE "<DEFINES>" "" CMAKE_C_COMPILE_OBJECT "${CMAKE_C_COMPILE_OBJECT}")
string(REPLACE "<INCLUDES>" "" CMAKE_C_COMPILE_OBJECT "${CMAKE_C_COMPILE_OBJECT}")
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+string(REPLACE "<FLAGS>" "" CMAKE_C_COMPILE_OBJECT "${CMAKE_C_COMPILE_OBJECT}")