diff --git a/Modules/Platform/WindowsKernelModeDriver-Initialize.cmake b/Modules/Platform/WindowsKernelModeDriver-Initialize.cmake index eb43935625..9ba33d027b 100644 --- a/Modules/Platform/WindowsKernelModeDriver-Initialize.cmake +++ b/Modules/Platform/WindowsKernelModeDriver-Initialize.cmake @@ -1,7 +1 @@ -# undocumented, do not use outside of CMake -cmake_language(GET_EXPERIMENTAL_FEATURE_ENABLED "WindowsKernelModeDriver" _cmake_windows_kernel_mode_driver_enabled) -if(NOT _cmake_windows_kernel_mode_driver_enabled) - message(FATAL_ERROR "Windows kernel-mode driver experimental support is not enabled.") -endif() - set(_CMAKE_FEATURE_DETECTION_TARGET_TYPE STATIC_LIBRARY) diff --git a/Source/cmExperimental.cxx b/Source/cmExperimental.cxx index fcd2d60ebc..2a018bc0a6 100644 --- a/Source/cmExperimental.cxx +++ b/Source/cmExperimental.cxx @@ -29,14 +29,6 @@ cmExperimental::FeatureData const LookupTable[] = { "only for experimentation and feedback to CMake developers.", {}, cmExperimental::TryCompileCondition::Always }, - // WindowsKernelModeDriver - { "WindowsKernelModeDriver", - "9157bf90-2313-44d6-aefa-67cd83c8be7c", - "CMAKE_EXPERIMENTAL_WINDOWS_KERNEL_MODE_DRIVER", - "CMake's Windows kernel-mode driver support is experimental. It is meant " - "only for experimentation and feedback to CMake developers.", - {}, - cmExperimental::TryCompileCondition::Always }, // CxxImportStd { "CxxImportStd", "d0edc3af-4c50-42ea-a356-e2862fe7a444", diff --git a/Source/cmExperimental.h b/Source/cmExperimental.h index d812b250d5..54fd691e85 100644 --- a/Source/cmExperimental.h +++ b/Source/cmExperimental.h @@ -18,7 +18,6 @@ public: enum class Feature { ExportPackageDependencies, - WindowsKernelModeDriver, CxxImportStd, ImportPackageInfo, ExportPackageInfo, diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 10e8c7f453..1a21b06e6f 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -478,9 +478,7 @@ bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf) if (!this->InitializeWindowsStore(mf)) { return false; } - } else if (this->SystemName == "WindowsKernelModeDriver"_s && - cmExperimental::HasSupportEnabled( - *mf, cmExperimental::Feature::WindowsKernelModeDriver)) { + } else if (this->SystemName == "WindowsKernelModeDriver"_s) { this->SystemIsWindowsKernelModeDriver = true; if (!this->InitializeWindowsKernelModeDriver(mf)) { return false; diff --git a/Tests/RunCMake/cmake_language/Experimental/WindowsKernelModeDriver-set-stderr.txt b/Tests/RunCMake/cmake_language/Experimental/WindowsKernelModeDriver-set-stderr.txt deleted file mode 100644 index f019a88193..0000000000 --- a/Tests/RunCMake/cmake_language/Experimental/WindowsKernelModeDriver-set-stderr.txt +++ /dev/null @@ -1,6 +0,0 @@ -^CMake Warning \(dev\) at Experimental/WindowsKernelModeDriver-set.cmake:4 \(cmake_language\): - CMake's Windows kernel-mode driver support is experimental. It is meant - only for experimentation and feedback to CMake developers. -Call Stack \(most recent call first\): - CMakeLists.txt:[0-9]+ \(include\) -This warning is for project developers. Use -Wno-dev to suppress it.$ diff --git a/Tests/RunCMake/cmake_language/Experimental/WindowsKernelModeDriver-set.cmake b/Tests/RunCMake/cmake_language/Experimental/WindowsKernelModeDriver-set.cmake deleted file mode 100644 index 517cc2b995..0000000000 --- a/Tests/RunCMake/cmake_language/Experimental/WindowsKernelModeDriver-set.cmake +++ /dev/null @@ -1,11 +0,0 @@ -set(CMAKE_EXPERIMENTAL_WINDOWS_KERNEL_MODE_DRIVER - "9157bf90-2313-44d6-aefa-67cd83c8be7c") - -cmake_language(GET_EXPERIMENTAL_FEATURE_ENABLED - "WindowsKernelModeDriver" - feature_present) - -if (NOT feature_present STREQUAL "TRUE") - message(FATAL_ERROR - "Expected the `WindowsKernelModeDriver` feature to be enabled.") -endif () diff --git a/Tests/RunCMake/cmake_language/Experimental/WindowsKernelModeDriver-unset.cmake b/Tests/RunCMake/cmake_language/Experimental/WindowsKernelModeDriver-unset.cmake deleted file mode 100644 index 7aee0d3de5..0000000000 --- a/Tests/RunCMake/cmake_language/Experimental/WindowsKernelModeDriver-unset.cmake +++ /dev/null @@ -1,8 +0,0 @@ -cmake_language(GET_EXPERIMENTAL_FEATURE_ENABLED - "WindowsKernelModeDriver" - feature_present) - -if (NOT feature_present STREQUAL "FALSE") - message(FATAL_ERROR - "Expected the `WindowsKernelModeDriver` feature to be disabled.") -endif () diff --git a/Tests/RunCMake/cmake_language/Experimental/WindowsKernelModeDriver-wrong-stderr.txt b/Tests/RunCMake/cmake_language/Experimental/WindowsKernelModeDriver-wrong-stderr.txt deleted file mode 100644 index c89c660578..0000000000 --- a/Tests/RunCMake/cmake_language/Experimental/WindowsKernelModeDriver-wrong-stderr.txt +++ /dev/null @@ -1,25 +0,0 @@ -^CMake Warning \(dev\) at Experimental/WindowsKernelModeDriver-wrong\.cmake:4 \(cmake_language\): - CMAKE_EXPERIMENTAL_WINDOWS_KERNEL_MODE_DRIVER is set to incorrect value - - 01234567-0123-0123-0123-0123456789ab - - See 'Help/dev/experimental\.rst' in the source tree of this version of CMake - for documentation of the experimental feature and the corresponding - activation value\. This project's code may require changes to work with - this CMake's version of the feature\. -Call Stack \(most recent call first\): - CMakeLists\.txt:[0-9]+ \(include\) -This warning is for project developers\. Use -Wno-dev to suppress it\. -+ -CMake Warning \(dev\) at Experimental/WindowsKernelModeDriver-wrong\.cmake:19 \(cmake_language\): - CMAKE_EXPERIMENTAL_WINDOWS_KERNEL_MODE_DRIVER is set to incorrect value - - 76543210-3210-3210-3210-ba9876543210 - - See 'Help/dev/experimental\.rst' in the source tree of this version of CMake - for documentation of the experimental feature and the corresponding - activation value\. This project's code may require changes to work with - this CMake's version of the feature\. -Call Stack \(most recent call first\): - CMakeLists\.txt:[0-9]+ \(include\) -This warning is for project developers\. Use -Wno-dev to suppress it\.$ diff --git a/Tests/RunCMake/cmake_language/Experimental/WindowsKernelModeDriver-wrong.cmake b/Tests/RunCMake/cmake_language/Experimental/WindowsKernelModeDriver-wrong.cmake deleted file mode 100644 index a63a50314d..0000000000 --- a/Tests/RunCMake/cmake_language/Experimental/WindowsKernelModeDriver-wrong.cmake +++ /dev/null @@ -1,21 +0,0 @@ -set(CMAKE_EXPERIMENTAL_WINDOWS_KERNEL_MODE_DRIVER - "01234567-0123-0123-0123-0123456789ab") - -cmake_language(GET_EXPERIMENTAL_FEATURE_ENABLED - "WindowsKernelModeDriver" - feature_present) - -if (NOT feature_present STREQUAL "FALSE") - message(FATAL_ERROR - "Expected the `WindowsKernelModeDriver` feature to be disabled.") -endif () - -# Test if/when warning is repeated. -cmake_language(GET_EXPERIMENTAL_FEATURE_ENABLED - "WindowsKernelModeDriver" - feature_present) -set(CMAKE_EXPERIMENTAL_WINDOWS_KERNEL_MODE_DRIVER - "76543210-3210-3210-3210-ba9876543210") -cmake_language(GET_EXPERIMENTAL_FEATURE_ENABLED - "WindowsKernelModeDriver" - feature_present) diff --git a/Tests/RunCMake/cmake_language/RunCMakeTest.cmake b/Tests/RunCMake/cmake_language/RunCMakeTest.cmake index db034c786e..d9d6d9774b 100644 --- a/Tests/RunCMake/cmake_language/RunCMakeTest.cmake +++ b/Tests/RunCMake/cmake_language/RunCMakeTest.cmake @@ -163,7 +163,4 @@ run_cmake(Experimental/CxxImportStd-wrong) run_cmake(Experimental/ExportPackageDependencies-set) run_cmake(Experimental/ExportPackageDependencies-unset) run_cmake(Experimental/ExportPackageDependencies-wrong) -run_cmake(Experimental/WindowsKernelModeDriver-set) -run_cmake(Experimental/WindowsKernelModeDriver-unset) -run_cmake(Experimental/WindowsKernelModeDriver-wrong) run_cmake(Experimental/Unknown)