diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2022-12-14 13:44:52 -0500 |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2022-12-15 18:43:47 -0500 |
| commit | e84fcbcb0b7c33caf35fbdfde411e8636f4d31f9 (patch) | |
| tree | 332a054ac99340340fa00103c5eee72046569143 /.gitlab | |
| parent | 5e35913382d0bbca6b843f6bbe2fd52fa47d32c9 (diff) | |
| download | cmake-e84fcbcb0b7c33caf35fbdfde411e8636f4d31f9.tar.gz | |
cxxmodules: support new round of Clang patches
These patches now support the `-MF` output, so remove the `none` support
added just for the old patchset which did not use it.
Also update the flag name to `-fmodule-output=`.
Due to the new Clang module mapper flag, use a new experimental support
UUID as well.
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/cxx_modules_rules_clang.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab/ci/cxx_modules_rules_clang.cmake b/.gitlab/ci/cxx_modules_rules_clang.cmake index 9d75880c68..4b80aabebc 100644 --- a/.gitlab/ci/cxx_modules_rules_clang.cmake +++ b/.gitlab/ci/cxx_modules_rules_clang.cmake @@ -3,11 +3,12 @@ set(CMake_TEST_CXXModules_UUID "a246741c-d067-4019-a8fb-3d16b0c9d1d3") set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1) string(CONCAT CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "${CMAKE_CXX_COMPILER_CLANG_SCAN_DEPS}" - " -format=p1689 --p1689-targeted-file-name=<SOURCE> --p1689-targeted-output=<OBJECT> --" + " -format=p1689 --p1689-targeted-file-name=<SOURCE> --p1689-targeted-output=<OBJECT> " + " --p1689-makeformat-output=<DEP_FILE>" + " --" " <DEFINES> <INCLUDES> <FLAGS> -x c++ <SOURCE>" + " -MT <DYNDEP_FILE> -MD" " > <DYNDEP_FILE>") -# No support for `-MF` discovered dependencies in `clang-scan-deps`. -set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_DEPFILE_FORMAT "none") set(CMAKE_EXPERIMENTAL_CXX_MODULE_MAP_FORMAT "clang") set(CMAKE_EXPERIMENTAL_CXX_MODULE_MAP_FLAG "@<MODULE_MAP_FILE>") |