diff options
| author | Brad King <brad.king@kitware.com> | 2024-10-25 12:21:21 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-10-25 12:21:32 (GMT) |
| commit | ebd038613ebe3722afe78a1cd33c8de7d77075df (patch) | |
| tree | f877170b90c2e8e7a9950dfdd3049a49ed292e1b | |
| parent | 0a37acc60790a28ed05032b21c0634da5ce41afe (diff) | |
| parent | 54bbd00448400e150d50b69737bdad623312dde5 (diff) | |
| download | CMake-ebd038613ebe3722afe78a1cd33c8de7d77075df.zip CMake-ebd038613ebe3722afe78a1cd33c8de7d77075df.tar.gz CMake-ebd038613ebe3722afe78a1cd33c8de7d77075df.tar.bz2 | |
Merge topic 'windows-kernel-mode-driver' into release-3.31
54bbd00448 WindowsKernelModeDriver: Switch to appending to variables
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9941
| -rw-r--r-- | Modules/Platform/WindowsKernelModeDriver.cmake | 13 | ||||
| -rw-r--r-- | Source/cmExperimental.cxx | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/cmake_language/Experimental/WindowsKernelModeDriver-set.cmake | 2 |
3 files changed, 6 insertions, 11 deletions
diff --git a/Modules/Platform/WindowsKernelModeDriver.cmake b/Modules/Platform/WindowsKernelModeDriver.cmake index 3b1a427..78bf2d4 100644 --- a/Modules/Platform/WindowsKernelModeDriver.cmake +++ b/Modules/Platform/WindowsKernelModeDriver.cmake @@ -41,27 +41,22 @@ macro(__windows_kernel_mode lang) set(_KMDF_PLATFORM "$ENV{Platform}") - if(NOT DEFINED CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES) - set(CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES + list(APPEND CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES $ENV{WindowsSdkDir}/Include/${_WINDOWS_SDK_VERSION}/km $ENV{WindowsSdkDir}/Include/${_WINDOWS_SDK_VERSION}/km/crt $ENV{WindowsSdkDir}/Include/${_WINDOWS_SDK_VERSION}/shared $ENV{WindowsSdkDir}/Include/wdf/kmdf/${CMAKE_WINDOWS_KMDF_VERSION} $ENV{VCToolsInstallDir}/include ) - endif() - if(NOT DEFINED CMAKE_RC_STANDARD_INCLUDE_DIRECTORIES) - set(CMAKE_RC_STANDARD_INCLUDE_DIRECTORIES + list(APPEND CMAKE_RC_STANDARD_INCLUDE_DIRECTORIES ${CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES} ) - endif() + list(REMOVE_DUPLICATES CMAKE_RC_STANDARD_INCLUDE_DIRECTORIES) - if(NOT DEFINED CMAKE_${lang}_STANDARD_LINK_DIRECTORIES) - set(CMAKE_${lang}_STANDARD_LINK_DIRECTORIES + list(APPEND CMAKE_${lang}_STANDARD_LINK_DIRECTORIES $ENV{WindowsSdkDir}/Lib/${_WINDOWS_SDK_VERSION}/km/${_KMDF_PLATFORM} ) - endif() unset(_KMDF_ERROR_EPILOGUE) unset(_KMDF_PLATFORM) diff --git a/Source/cmExperimental.cxx b/Source/cmExperimental.cxx index 0e4ccc1..85eff1a 100644 --- a/Source/cmExperimental.cxx +++ b/Source/cmExperimental.cxx @@ -30,7 +30,7 @@ cmExperimental::FeatureData LookupTable[] = { false }, // WindowsKernelModeDriver { "WindowsKernelModeDriver", - "7f524e81-99c7-48f3-a35d-278bae54282c", + "fac18f65-504e-4dbb-b068-f356bb1f2ddb", "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.", diff --git a/Tests/RunCMake/cmake_language/Experimental/WindowsKernelModeDriver-set.cmake b/Tests/RunCMake/cmake_language/Experimental/WindowsKernelModeDriver-set.cmake index 8068aaa..f9e22c5 100644 --- a/Tests/RunCMake/cmake_language/Experimental/WindowsKernelModeDriver-set.cmake +++ b/Tests/RunCMake/cmake_language/Experimental/WindowsKernelModeDriver-set.cmake @@ -1,5 +1,5 @@ set(CMAKE_EXPERIMENTAL_WINDOWS_KERNEL_MODE_DRIVER - "7f524e81-99c7-48f3-a35d-278bae54282c") + "fac18f65-504e-4dbb-b068-f356bb1f2ddb") cmake_language(GET_EXPERIMENTAL_FEATURE_ENABLED "WindowsKernelModeDriver" |