ci: use a toolchain file for C++ modules variables

mpusz · Oct 19, 2023 · b6ddfe4 · b6ddfe4
1 parent ea3f05e
commit b6ddfe4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.github/ci/clang-17-modules-toolchain.cmake b/.github/ci/clang-17-modules-toolchain.cmake
@@ -0,0 +1,2 @@
+set(CMAKE_CXX_COMPILER_CLANG_SCAN_DEPS "/usr/bin/clang-scan-deps-17")
+set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "aa1f7df0-828a-4fcd-9afc-2dc80491aca7")
diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml
@@ -132,7 +132,7 @@ jobs:
                   cxx: "clang++-17",
                 },
               lib: "libc++",
-              conan-config: "",
+              conan-config: ".github/ci/clang-17-modules-toolchain.cmake",
               modules: "True",
             }
           # - {

diff --git a/conanfile.py b/conanfile.py
@@ -139,9 +139,6 @@ def generate(self):
         tc.variables["MP_UNITS_BUILD_MODULES"] = self._build_modules
         tc.variables["MP_UNITS_BUILD_LA"] = self._build_all and not self._skip_la
         tc.variables["MP_UNITS_USE_LIBFMT"] = self._use_libfmt
-        if self._build_modules:
-            tc.variables["CMAKE_CXX_COMPILER_CLANG_SCAN_DEPS"] = "/usr/bin/clang-scan-deps-17"
-            tc.variables["CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API"] = "aa1f7df0-828a-4fcd-9afc-2dc80491aca7"
         tc.generate()
         deps = CMakeDeps(self)
         deps.generate()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		set(CMAKE_CXX_COMPILER_CLANG_SCAN_DEPS "/usr/bin/clang-scan-deps-17")
		set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "aa1f7df0-828a-4fcd-9afc-2dc80491aca7")