From cd179e75606c6dc821b10574927e449b397b931c Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 11 Dec 2024 12:10:48 -0500 Subject: Tests/RunCMake/CXXModules: Rename FileSetModules cases to be more specific They all add `CXX_MODULES` to `STATIC` libraries. --- Tests/RunCMake/CXXModules/FileSetModulesInterface-result.txt | 1 - Tests/RunCMake/CXXModules/FileSetModulesInterface-stderr.txt | 5 ----- Tests/RunCMake/CXXModules/FileSetModulesInterface.cmake | 8 -------- .../CXXModules/FileSetModulesInterfaceOnStatic-result.txt | 1 + .../CXXModules/FileSetModulesInterfaceOnStatic-stderr.txt | 5 +++++ .../RunCMake/CXXModules/FileSetModulesInterfaceOnStatic.cmake | 8 ++++++++ Tests/RunCMake/CXXModules/FileSetModulesPrivate.cmake | 11 ----------- Tests/RunCMake/CXXModules/FileSetModulesPrivateOnStatic.cmake | 11 +++++++++++ Tests/RunCMake/CXXModules/FileSetModulesPublic.cmake | 11 ----------- Tests/RunCMake/CXXModules/FileSetModulesPublicOnStatic.cmake | 11 +++++++++++ Tests/RunCMake/CXXModules/RunCMakeTest.cmake | 7 ++++++- 11 files changed, 42 insertions(+), 37 deletions(-) delete mode 100644 Tests/RunCMake/CXXModules/FileSetModulesInterface-result.txt delete mode 100644 Tests/RunCMake/CXXModules/FileSetModulesInterface-stderr.txt delete mode 100644 Tests/RunCMake/CXXModules/FileSetModulesInterface.cmake create mode 100644 Tests/RunCMake/CXXModules/FileSetModulesInterfaceOnStatic-result.txt create mode 100644 Tests/RunCMake/CXXModules/FileSetModulesInterfaceOnStatic-stderr.txt create mode 100644 Tests/RunCMake/CXXModules/FileSetModulesInterfaceOnStatic.cmake delete mode 100644 Tests/RunCMake/CXXModules/FileSetModulesPrivate.cmake create mode 100644 Tests/RunCMake/CXXModules/FileSetModulesPrivateOnStatic.cmake delete mode 100644 Tests/RunCMake/CXXModules/FileSetModulesPublic.cmake create mode 100644 Tests/RunCMake/CXXModules/FileSetModulesPublicOnStatic.cmake diff --git a/Tests/RunCMake/CXXModules/FileSetModulesInterface-result.txt b/Tests/RunCMake/CXXModules/FileSetModulesInterface-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/CXXModules/FileSetModulesInterface-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/CXXModules/FileSetModulesInterface-stderr.txt b/Tests/RunCMake/CXXModules/FileSetModulesInterface-stderr.txt deleted file mode 100644 index 7269c65..0000000 --- a/Tests/RunCMake/CXXModules/FileSetModulesInterface-stderr.txt +++ /dev/null @@ -1,5 +0,0 @@ -CMake Error at FileSetModulesInterface.cmake:[0-9]+ \(target_sources\): - target_sources File set TYPE "CXX_MODULES" may not have "INTERFACE" - visibility -Call Stack \(most recent call first\): - CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/CXXModules/FileSetModulesInterface.cmake b/Tests/RunCMake/CXXModules/FileSetModulesInterface.cmake deleted file mode 100644 index 24cec3e..0000000 --- a/Tests/RunCMake/CXXModules/FileSetModulesInterface.cmake +++ /dev/null @@ -1,8 +0,0 @@ -add_library(module) -target_sources(module - INTERFACE - FILE_SET fs TYPE CXX_MODULES FILES - sources/module.cxx) -target_compile_features(module - PRIVATE - cxx_std_20) diff --git a/Tests/RunCMake/CXXModules/FileSetModulesInterfaceOnStatic-result.txt b/Tests/RunCMake/CXXModules/FileSetModulesInterfaceOnStatic-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/CXXModules/FileSetModulesInterfaceOnStatic-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/CXXModules/FileSetModulesInterfaceOnStatic-stderr.txt b/Tests/RunCMake/CXXModules/FileSetModulesInterfaceOnStatic-stderr.txt new file mode 100644 index 0000000..7d099de --- /dev/null +++ b/Tests/RunCMake/CXXModules/FileSetModulesInterfaceOnStatic-stderr.txt @@ -0,0 +1,5 @@ +CMake Error at FileSetModulesInterfaceOnStatic.cmake:[0-9]+ \(target_sources\): + target_sources File set TYPE "CXX_MODULES" may not have "INTERFACE" + visibility +Call Stack \(most recent call first\): + CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/CXXModules/FileSetModulesInterfaceOnStatic.cmake b/Tests/RunCMake/CXXModules/FileSetModulesInterfaceOnStatic.cmake new file mode 100644 index 0000000..24cec3e --- /dev/null +++ b/Tests/RunCMake/CXXModules/FileSetModulesInterfaceOnStatic.cmake @@ -0,0 +1,8 @@ +add_library(module) +target_sources(module + INTERFACE + FILE_SET fs TYPE CXX_MODULES FILES + sources/module.cxx) +target_compile_features(module + PRIVATE + cxx_std_20) diff --git a/Tests/RunCMake/CXXModules/FileSetModulesPrivate.cmake b/Tests/RunCMake/CXXModules/FileSetModulesPrivate.cmake deleted file mode 100644 index 83bbd4d..0000000 --- a/Tests/RunCMake/CXXModules/FileSetModulesPrivate.cmake +++ /dev/null @@ -1,11 +0,0 @@ -enable_language(CXX) -set(CMAKE_CXX_SCANDEP_SOURCE "") - -add_library(module) -target_sources(module - PRIVATE - FILE_SET fs TYPE CXX_MODULES FILES - sources/module.cxx) -target_compile_features(module - PRIVATE - cxx_std_20) diff --git a/Tests/RunCMake/CXXModules/FileSetModulesPrivateOnStatic.cmake b/Tests/RunCMake/CXXModules/FileSetModulesPrivateOnStatic.cmake new file mode 100644 index 0000000..83bbd4d --- /dev/null +++ b/Tests/RunCMake/CXXModules/FileSetModulesPrivateOnStatic.cmake @@ -0,0 +1,11 @@ +enable_language(CXX) +set(CMAKE_CXX_SCANDEP_SOURCE "") + +add_library(module) +target_sources(module + PRIVATE + FILE_SET fs TYPE CXX_MODULES FILES + sources/module.cxx) +target_compile_features(module + PRIVATE + cxx_std_20) diff --git a/Tests/RunCMake/CXXModules/FileSetModulesPublic.cmake b/Tests/RunCMake/CXXModules/FileSetModulesPublic.cmake deleted file mode 100644 index 52ba35f..0000000 --- a/Tests/RunCMake/CXXModules/FileSetModulesPublic.cmake +++ /dev/null @@ -1,11 +0,0 @@ -enable_language(CXX) -set(CMAKE_CXX_SCANDEP_SOURCE "") - -add_library(module) -target_sources(module - PUBLIC - FILE_SET fs TYPE CXX_MODULES FILES - sources/module.cxx) -target_compile_features(module - PRIVATE - cxx_std_20) diff --git a/Tests/RunCMake/CXXModules/FileSetModulesPublicOnStatic.cmake b/Tests/RunCMake/CXXModules/FileSetModulesPublicOnStatic.cmake new file mode 100644 index 0000000..52ba35f --- /dev/null +++ b/Tests/RunCMake/CXXModules/FileSetModulesPublicOnStatic.cmake @@ -0,0 +1,11 @@ +enable_language(CXX) +set(CMAKE_CXX_SCANDEP_SOURCE "") + +add_library(module) +target_sources(module + PUBLIC + FILE_SET fs TYPE CXX_MODULES FILES + sources/module.cxx) +target_compile_features(module + PRIVATE + cxx_std_20) diff --git a/Tests/RunCMake/CXXModules/RunCMakeTest.cmake b/Tests/RunCMake/CXXModules/RunCMakeTest.cmake index 8b7bc86..0413793 100644 --- a/Tests/RunCMake/CXXModules/RunCMakeTest.cmake +++ b/Tests/RunCMake/CXXModules/RunCMakeTest.cmake @@ -71,9 +71,14 @@ set(scopes Interface Private Public) +set(target_types + Static + ) foreach (fileset_type IN LISTS fileset_types) foreach (scope IN LISTS scopes) - run_cmake("FileSet${fileset_type}${scope}") + foreach (target_type IN LISTS target_types) + run_cmake("FileSet${fileset_type}${scope}On${target_type}") + endforeach () endforeach () run_cmake("FileSet${fileset_type}InterfaceImported") -- cgit v0.12