diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-11-16 00:08:48 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-11-16 01:51:22 +0100 |
| commit | 9e9e91b3c2489b69d50d721a9f91b290d9363025 (patch) | |
| tree | ae11e51d1fcb7332d3347b540d7b4fdb0901504d | |
| parent | 628c281db6fd0cf68f5fbae34dec6f7143a48f27 (diff) | |
| download | mariadb-git-9e9e91b3c2489b69d50d721a9f91b290d9363025.tar.gz | |
Windows build - fix signtool search path to take modern SDKs into account
| -rw-r--r-- | cmake/install_macros.cmake | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake index 3b74ad80ef8..9724620c068 100644 --- a/cmake/install_macros.cmake +++ b/cmake/install_macros.cmake @@ -184,16 +184,20 @@ IF(WIN32) SET(SIGNTOOL_PARAMETERS /a /t http://timestamp.globalsign.com/?signature=sha2 CACHE STRING "parameters for signtool (list)") - FIND_PROGRAM(SIGNTOOL_EXECUTABLE signtool - PATHS "$ENV{ProgramFiles}/Microsoft SDKs/Windows/v7.0A/bin" - "$ENV{ProgramFiles}/Windows Kits/8.0/bin/x86" - "$ENV{ProgramFiles}/Windows Kits/8.1/bin/x86" - ) IF(NOT SIGNTOOL_EXECUTABLE) - MESSAGE(FATAL_ERROR - "signtool is not found. Signing executables not possible") + FILE(GLOB path_list + "$ENV{ProgramFiles} (x86)/Windows Kits/*/bin/*/x64" + "$ENV{ProgramFiles} (x86)/Windows Kits/*/App Certification Kit" + ) + FIND_PROGRAM(SIGNTOOL_EXECUTABLE signtool + PATHS ${path_list} + ) + IF(NOT SIGNTOOL_EXECUTABLE) + MESSAGE(FATAL_ERROR + "signtool is not found. Signing executables not possible") + ENDIF() + MARK_AS_ADVANCED(SIGNTOOL_EXECUTABLE SIGNTOOL_PARAMETERS) ENDIF() - MARK_AS_ADVANCED(SIGNTOOL_EXECUTABLE SIGNTOOL_PARAMETERS) ENDIF() ENDIF() |