diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-17 13:55:54 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-17 13:55:54 +0200 |
| commit | 9962cda52722b77c2a7e0314bbaa2e4f963f55c1 (patch) | |
| tree | 576d56bc2ddf7f644ce56c4a1ef27ca59cc42290 /cmake | |
| parent | 7ea12742d30be7b56120f1bf66d91f777b1da450 (diff) | |
| parent | ed0a224b3d42423699d977c338e3da05fccafaf2 (diff) | |
| download | mariadb-git-9962cda52722b77c2a7e0314bbaa2e4f963f55c1.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'cmake')
| -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 6b0e945abe4..ee1a39066b1 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() |