summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2023-05-26 13:34:52 (GMT)
committerBen Boeckel <ben.boeckel@kitware.com>2023-05-31 14:57:11 (GMT)
commit6ff5cdc533a7c9281c97c9d22dd9cd3e05494f3a (patch)
tree109af6d3021aae795af9a6520f65be545c5b2a6d /Tests/RunCMake
parent26240066084b9cbe37956cee4b3be1e75e144ce5 (diff)
downloadCMake-6ff5cdc533a7c9281c97c9d22dd9cd3e05494f3a.zip
CMake-6ff5cdc533a7c9281c97c9d22dd9cd3e05494f3a.tar.gz
CMake-6ff5cdc533a7c9281c97c9d22dd9cd3e05494f3a.tar.bz2
cxxmodules: remove support for `CXX_MODULE_HEADER_UNITS` filesets
There's no backing implementation for header units anyways, so just remove it for now.
Diffstat (limited to 'Tests/RunCMake')
-rw-r--r--Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterface-result.txt1
-rw-r--r--Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterface-stderr.txt12
-rw-r--r--Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterface.cmake8
-rw-r--r--Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterfaceImported-stderr.txt6
-rw-r--r--Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterfaceImported.cmake8
-rw-r--r--Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsPrivate-stderr.txt11
-rw-r--r--Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsPrivate.cmake13
-rw-r--r--Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsPublic-stderr.txt11
-rw-r--r--Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsPublic.cmake13
-rw-r--r--Tests/RunCMake/CXXModules/FileSetModulesInterface-stderr.txt4
-rw-r--r--Tests/RunCMake/CXXModules/NotCXXSourceModuleHeaderUnits-result.txt1
-rw-r--r--Tests/RunCMake/CXXModules/NotCXXSourceModuleHeaderUnits-stderr.txt22
-rw-r--r--Tests/RunCMake/CXXModules/NotCXXSourceModuleHeaderUnits.cmake15
-rw-r--r--Tests/RunCMake/CXXModules/RunCMakeTest.cmake3
-rw-r--r--Tests/RunCMake/target_sources/FileSetDefaultWrongTypeExperimental-stderr.txt3
-rw-r--r--Tests/RunCMake/target_sources/FileSetWrongTypeExperimental-stderr.txt3
16 files changed, 5 insertions, 129 deletions
diff --git a/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterface-result.txt b/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterface-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterface-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterface-stderr.txt b/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterface-stderr.txt
deleted file mode 100644
index d573a02..0000000
--- a/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterface-stderr.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-CMake Warning \(dev\) at FileSetModuleHeaderUnitsInterface.cmake:2 \(target_sources\):
- CMake's C\+\+ module support is experimental. It is meant only for
- experimentation and feedback to CMake developers.
-Call Stack \(most recent call first\):
- CMakeLists.txt:6 \(include\)
-This warning is for project developers. Use -Wno-dev to suppress it.
-
-CMake Error at FileSetModuleHeaderUnitsInterface.cmake:2 \(target_sources\):
- target_sources File set TYPEs "CXX_MODULES" and "CXX_MODULE_HEADER_UNITS"
- may not have "INTERFACE" visibility
-Call Stack \(most recent call first\):
- CMakeLists.txt:6 \(include\)
diff --git a/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterface.cmake b/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterface.cmake
deleted file mode 100644
index 03ca17e..0000000
--- a/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterface.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-add_library(module-header)
-target_sources(module-header
- INTERFACE
- FILE_SET fs TYPE CXX_MODULE_HEADER_UNITS FILES
- sources/module-header.h)
-target_compile_features(module-header
- PRIVATE
- cxx_std_20)
diff --git a/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterfaceImported-stderr.txt b/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterfaceImported-stderr.txt
deleted file mode 100644
index 1b4ba5d..0000000
--- a/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterfaceImported-stderr.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CMake Warning \(dev\) at FileSetModuleHeaderUnitsInterfaceImported.cmake:2 \(target_sources\):
- CMake's C\+\+ module support is experimental. It is meant only for
- experimentation and feedback to CMake developers.
-Call Stack \(most recent call first\):
- CMakeLists.txt:6 \(include\)
-This warning is for project developers. Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterfaceImported.cmake b/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterfaceImported.cmake
deleted file mode 100644
index d287198..0000000
--- a/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsInterfaceImported.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-add_library(module-header INTERFACE IMPORTED)
-target_sources(module-header
- INTERFACE
- FILE_SET fs TYPE CXX_MODULE_HEADER_UNITS FILES
- sources/module-header.h)
-target_compile_features(module-header
- INTERFACE
- cxx_std_20)
diff --git a/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsPrivate-stderr.txt b/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsPrivate-stderr.txt
deleted file mode 100644
index a7ac88e..0000000
--- a/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsPrivate-stderr.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-CMake Warning \(dev\) at FileSetModuleHeaderUnitsPrivate.cmake:7 \(target_sources\):
- CMake's C\+\+ module support is experimental. It is meant only for
- experimentation and feedback to CMake developers.
-Call Stack \(most recent call first\):
- CMakeLists.txt:6 \(include\)
-This warning is for project developers. Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
- C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
- experimental. It is meant only for compiler developers to try.
-This warning is for project developers. Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsPrivate.cmake b/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsPrivate.cmake
deleted file mode 100644
index ebf9853..0000000
--- a/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsPrivate.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-enable_language(CXX)
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
-set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
-
-add_library(module-header
- sources/cxx-anchor.cxx)
-target_sources(module-header
- PRIVATE
- FILE_SET fs TYPE CXX_MODULE_HEADER_UNITS FILES
- sources/module-header.h)
-target_compile_features(module-header
- PRIVATE
- cxx_std_20)
diff --git a/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsPublic-stderr.txt b/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsPublic-stderr.txt
deleted file mode 100644
index a5b4ede..0000000
--- a/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsPublic-stderr.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-CMake Warning \(dev\) at FileSetModuleHeaderUnitsPublic.cmake:7 \(target_sources\):
- CMake's C\+\+ module support is experimental. It is meant only for
- experimentation and feedback to CMake developers.
-Call Stack \(most recent call first\):
- CMakeLists.txt:6 \(include\)
-This warning is for project developers. Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
- C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
- experimental. It is meant only for compiler developers to try.
-This warning is for project developers. Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsPublic.cmake b/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsPublic.cmake
deleted file mode 100644
index 3dfccbb5..0000000
--- a/Tests/RunCMake/CXXModules/FileSetModuleHeaderUnitsPublic.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-enable_language(CXX)
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
-set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
-
-add_library(module-header
- sources/cxx-anchor.cxx)
-target_sources(module-header
- PUBLIC
- FILE_SET fs TYPE CXX_MODULE_HEADER_UNITS FILES
- sources/module-header.h)
-target_compile_features(module-header
- PRIVATE
- cxx_std_20)
diff --git a/Tests/RunCMake/CXXModules/FileSetModulesInterface-stderr.txt b/Tests/RunCMake/CXXModules/FileSetModulesInterface-stderr.txt
index 81a35e8..dfcdbec 100644
--- a/Tests/RunCMake/CXXModules/FileSetModulesInterface-stderr.txt
+++ b/Tests/RunCMake/CXXModules/FileSetModulesInterface-stderr.txt
@@ -6,7 +6,7 @@ Call Stack \(most recent call first\):
This warning is for project developers. Use -Wno-dev to suppress it.
CMake Error at FileSetModulesInterface.cmake:2 \(target_sources\):
- target_sources File set TYPEs "CXX_MODULES" and "CXX_MODULE_HEADER_UNITS"
- may not have "INTERFACE" visibility
+ target_sources File set TYPE "CXX_MODULES" may not have "INTERFACE"
+ visibility
Call Stack \(most recent call first\):
CMakeLists.txt:6 \(include\)
diff --git a/Tests/RunCMake/CXXModules/NotCXXSourceModuleHeaderUnits-result.txt b/Tests/RunCMake/CXXModules/NotCXXSourceModuleHeaderUnits-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/CXXModules/NotCXXSourceModuleHeaderUnits-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/CXXModules/NotCXXSourceModuleHeaderUnits-stderr.txt b/Tests/RunCMake/CXXModules/NotCXXSourceModuleHeaderUnits-stderr.txt
deleted file mode 100644
index a93eb40..0000000
--- a/Tests/RunCMake/CXXModules/NotCXXSourceModuleHeaderUnits-stderr.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-CMake Warning \(dev\) at NotCXXSourceModuleHeaderUnits.cmake:7 \(target_sources\):
- CMake's C\+\+ module support is experimental. It is meant only for
- experimentation and feedback to CMake developers.
-Call Stack \(most recent call first\):
- CMakeLists.txt:6 \(include\)
-This warning is for project developers. Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
- C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
- experimental. It is meant only for compiler developers to try.
-This warning is for project developers. Use -Wno-dev to suppress it.
-
-CMake Error in CMakeLists.txt:
- Target "not-cxx-source" contains the source
-
- .*/Tests/RunCMake/CXXModules/sources/c-anchor.c
-
- in a file set of type "CXX_MODULE_HEADER_UNITS" but the source is not
- classified as a "CXX" source.
-
-
-CMake Generate step failed. Build files cannot be regenerated correctly.
diff --git a/Tests/RunCMake/CXXModules/NotCXXSourceModuleHeaderUnits.cmake b/Tests/RunCMake/CXXModules/NotCXXSourceModuleHeaderUnits.cmake
deleted file mode 100644
index af4ddac..0000000
--- a/Tests/RunCMake/CXXModules/NotCXXSourceModuleHeaderUnits.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-enable_language(C)
-enable_language(CXX)
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
-set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
-
-add_library(not-cxx-source)
-target_sources(not-cxx-source
- PRIVATE
- sources/cxx-anchor.cxx
- PUBLIC
- FILE_SET fs TYPE CXX_MODULE_HEADER_UNITS FILES
- sources/c-anchor.c)
-target_compile_features(not-cxx-source
- PRIVATE
- cxx_std_20)
diff --git a/Tests/RunCMake/CXXModules/RunCMakeTest.cmake b/Tests/RunCMake/CXXModules/RunCMakeTest.cmake
index b088724..1569f91 100644
--- a/Tests/RunCMake/CXXModules/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CXXModules/RunCMakeTest.cmake
@@ -60,8 +60,7 @@ if (NOT generator_supports_cxx_modules)
endif ()
set(fileset_types
- Modules
- ModuleHeaderUnits)
+ Modules)
set(scopes
Interface
Private
diff --git a/Tests/RunCMake/target_sources/FileSetDefaultWrongTypeExperimental-stderr.txt b/Tests/RunCMake/target_sources/FileSetDefaultWrongTypeExperimental-stderr.txt
index 042d67d..5356b07 100644
--- a/Tests/RunCMake/target_sources/FileSetDefaultWrongTypeExperimental-stderr.txt
+++ b/Tests/RunCMake/target_sources/FileSetDefaultWrongTypeExperimental-stderr.txt
@@ -6,7 +6,6 @@ Call Stack \(most recent call first\):
This warning is for project developers. Use -Wno-dev to suppress it.
CMake Error at FileSetDefaultWrongTypeExperimental\.cmake:[0-9]+ \(target_sources\):
- target_sources File set TYPE may only be "HEADERS", "CXX_MODULES", or
- "CXX_MODULE_HEADER_UNITS"
+ target_sources File set TYPE may only be "HEADERS" or "CXX_MODULES"
Call Stack \(most recent call first\):
CMakeLists\.txt:[0-9]+ \(include\)$
diff --git a/Tests/RunCMake/target_sources/FileSetWrongTypeExperimental-stderr.txt b/Tests/RunCMake/target_sources/FileSetWrongTypeExperimental-stderr.txt
index a1b784f..5c75000 100644
--- a/Tests/RunCMake/target_sources/FileSetWrongTypeExperimental-stderr.txt
+++ b/Tests/RunCMake/target_sources/FileSetWrongTypeExperimental-stderr.txt
@@ -6,7 +6,6 @@ Call Stack \(most recent call first\):
This warning is for project developers. Use -Wno-dev to suppress it.
CMake Error at FileSetWrongTypeExperimental\.cmake:[0-9]+ \(target_sources\):
- target_sources File set TYPE may only be "HEADERS", "CXX_MODULES", or
- "CXX_MODULE_HEADER_UNITS"
+ target_sources File set TYPE may only be "HEADERS" or "CXX_MODULES"
Call Stack \(most recent call first\):
CMakeLists\.txt:[0-9]+ \(include\)$