From 0d837ba0f04311c94ad6e443f91e455ed2f4d22f Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Fri, 11 Aug 2023 12:16:59 -0400
Subject: ci: update gcc module rules file for new flag spellings

---
 .gitlab/ci/cxx_modules_rules_gcc.cmake | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/.gitlab/ci/cxx_modules_rules_gcc.cmake b/.gitlab/ci/cxx_modules_rules_gcc.cmake
index 3777506..3726f6d 100644
--- a/.gitlab/ci/cxx_modules_rules_gcc.cmake
+++ b/.gitlab/ci/cxx_modules_rules_gcc.cmake
@@ -3,7 +3,17 @@ set(CMake_TEST_CXXModules_UUID "a246741c-d067-4019-a8fb-3d16b0c9d1d3")
 string(CONCAT CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE
   "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E -x c++ <SOURCE>"
   " -MT <DYNDEP_FILE> -MD -MF <DEP_FILE>"
-  " -fmodules-ts -fdep-file=<DYNDEP_FILE> -fdep-output=<OBJECT> -fdep-format=trtbd"
+  " -fmodules-ts -fdeps-file=<DYNDEP_FILE> -fdeps-target=<OBJECT> -fdeps-format=p1689r5"
   " -o <PREPROCESSED_SOURCE>")
 set(CMAKE_EXPERIMENTAL_CXX_MODULE_MAP_FORMAT "gcc")
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_MAP_FLAG "-fmodules-ts -fmodule-mapper=<MODULE_MAP_FILE> -fdep-format=trtbd -x c++")
+string(CONCAT CMAKE_EXPERIMENTAL_CXX_MODULE_MAP_FLAG
+  # Turn on modules.
+  "-fmodules-ts"
+  # Read the module mapper file.
+  " -fmodule-mapper=<MODULE_MAP_FILE>"
+  # Make sure dependency tracking is enabled (missing from `try_*`).
+  " -MD"
+  # Suppress `CXX_MODULES +=` from generated depfile snippets.
+  " -fdeps-format=p1689r5"
+  # Force C++ as a language.
+  " -x c++")
-- 
cgit v0.12