mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-04 21:00:17 -06:00
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
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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.",
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user