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 /Modules/Platform/WindowsKernelModeDriver.cmake | |
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
Diffstat (limited to 'Modules/Platform/WindowsKernelModeDriver.cmake')
-rw-r--r-- | Modules/Platform/WindowsKernelModeDriver.cmake | 13 |
1 files changed, 4 insertions, 9 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) |