mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-05 22:00:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'cxxmodules-clang-update'

Browse Source 
5dc17d0a7a gitlab-ci: update to new Clang CI image for C++ modules
e84fcbcb0b cxxmodules: support new round of Clang patches
5e35913382 ci: update `llvm` snapshot to newest patch revisions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8019
This commit is contained in:
Brad King
2022-12-17 13:47:24 +00:00
committed by Kitware Robot
parent 696c3ed3d3 5dc17d0a7a
commit 02599da236
15 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab/ci/cxx_modules_rules_clang.cmake
+4 -3
View File
@@ -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>")
.gitlab/ci/docker/clang_cxx_modules/install_llvm.sh
+1 -1
View File
@@ -2,7 +2,7 @@
set -e
readonly revision="p1689r5-cmake-ci-20221201" # ae3b5489585b60a2b7f090ebb9e1e8729b811253
readonly revision="p1689r5-cmake-ci-20221215" # a0acf2c9285e848b65ec7336e185888163949490
readonly tarball="https://github.com/mathstuf/llvm-project/archive/$revision.tar.gz"
readonly workdir="$HOME/llvm"
.gitlab/os-linux.yml
+1 -1
View File
@@ -377,7 +377,7 @@
CMAKE_GENERATOR: "Ninja Multi-Config"
.clang_cxx_modules_x86_64:
image: "kitware/cmake:ci-clang_cxx_modules-x86_64-2022-12-02"
image: "kitware/cmake:ci-clang_cxx_modules-x86_64-2022-12-15"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
Help/dev/experimental.rst
+1 -1
View File
@@ -18,7 +18,7 @@ C++20 Module APIs
=================
Variable: ``CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API``
Value: ``9629ab6c-6c0e-423f-bb9d-cc5ac4a22041``
Value: ``2182bf5c-ef0d-489a-91da-49dbc3090d2a``
In order to support C++20 modules, there are a number of behaviors that have
CMake APIs to provide the required features to build and export them from a
Source/cmCxxModuleMapper.cxx
+1 -1
View File
@@ -47,7 +47,7 @@ std::string CxxModuleMapContentClang(CxxModuleLocations const& loc,
// extension.
mm << "-x c++-module\n";
mm << "-fsave-std-c++-module-file=" << *bmi_loc << '\n';
mm << "-fmodule-output=" << *bmi_loc << '\n';
break;
}
}
Source/cmExperimental.cxx
+1 -1
View File
@@ -27,7 +27,7 @@ struct FeatureData
bool Warned;
} LookupTable[] = {
// CxxModuleCMakeApi
{ "9629ab6c-6c0e-423f-bb9d-cc5ac4a22041",
{ "2182bf5c-ef0d-489a-91da-49dbc3090d2a",
"CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API",
"CMake's C++ module support is experimental. It is meant only for "
"experimentation and feedback to CMake developers.",
Source/cmNinjaTargetGenerator.cxx
-3
View File
@@ -562,9 +562,6 @@ cmNinjaRule GetScanRule(
if (deptype == "msvc"_s) {
rule.DepType = deptype;
rule.DepFile.clear();
} else if (deptype == "none"_s) {
rule.DepType.clear(); // no deps= for multiple outputs
rule.DepFile.clear();
} else {
rule.DepType.clear(); // no deps= for multiple outputs
rule.DepFile = "$DEP_FILE";
Tests/RunCMake/CXXModules/CMakeLists.txt
+1 -1
View File
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.23)
project(${RunCMake_TEST} NONE)
set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "9629ab6c-6c0e-423f-bb9d-cc5ac4a22041")
set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "2182bf5c-ef0d-489a-91da-49dbc3090d2a")
include(${RunCMake_TEST}.cmake)
Tests/RunCMake/CXXModules/examples/cxx-modules-rules.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "9629ab6c-6c0e-423f-bb9d-cc5ac4a22041")
set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "2182bf5c-ef0d-489a-91da-49dbc3090d2a")
if (NOT EXISTS "${CMake_TEST_MODULE_COMPILATION_RULES}")
message(FATAL_ERROR
Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-build/test/CMakeLists.txt
+1 -1
View File
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.24)
project(cxx_modules_library NONE)
set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "9629ab6c-6c0e-423f-bb9d-cc5ac4a22041")
set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "2182bf5c-ef0d-489a-91da-49dbc3090d2a")
find_package(export_bmi_and_interfaces REQUIRED)
Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-install/test/CMakeLists.txt
+1 -1
View File
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.24)
project(cxx_modules_library NONE)
set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "9629ab6c-6c0e-423f-bb9d-cc5ac4a22041")
set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "2182bf5c-ef0d-489a-91da-49dbc3090d2a")
find_package(export_bmi_and_interfaces REQUIRED)
Tests/RunCMake/CXXModules/examples/export-interface-build/test/CMakeLists.txt
+1 -1
View File
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.24)
project(cxx_modules_library NONE)
set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "9629ab6c-6c0e-423f-bb9d-cc5ac4a22041")
set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "2182bf5c-ef0d-489a-91da-49dbc3090d2a")
find_package(export_interfaces REQUIRED)
Tests/RunCMake/CXXModules/examples/export-interface-install/test/CMakeLists.txt
+1 -1
View File
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.24)
project(cxx_modules_library NONE)
set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "9629ab6c-6c0e-423f-bb9d-cc5ac4a22041")
set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "2182bf5c-ef0d-489a-91da-49dbc3090d2a")
find_package(export_interfaces REQUIRED)
Tests/RunCMake/target_sources/FileSetDefaultWrongTypeExperimental.cmake
+1 -1
View File
@@ -1,6 +1,6 @@
enable_language(C)
set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "9629ab6c-6c0e-423f-bb9d-cc5ac4a22041")
set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "2182bf5c-ef0d-489a-91da-49dbc3090d2a")
add_library(lib1 STATIC empty.c)
target_sources(lib1 PRIVATE FILE_SET UNKNOWN)
Tests/RunCMake/target_sources/FileSetWrongTypeExperimental.cmake
+1 -1
View File
@@ -1,6 +1,6 @@
enable_language(C)
set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "9629ab6c-6c0e-423f-bb9d-cc5ac4a22041")
set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "2182bf5c-ef0d-489a-91da-49dbc3090d2a")
add_library(lib1 STATIC empty.c)
target_sources(lib1 PRIVATE FILE_SET a TYPE UNKNOWN)