diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-05-03 19:02:48 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-06-16 12:37:00 +0200 |
| commit | 320bf3755b07a727ab5d419422760412b43d922d (patch) | |
| tree | 815a9f33b8fcea18b98840387d7af00f337a1a64 | |
| parent | 63d29dd0e689ad49a7c75b40cf2dbda7e33795f5 (diff) | |
Build: Prioritize manually selected openssl location over default installed one
(cherry picked from commit 370dd97998bac1318592eaf93ee192089127bfda)
| -rw-r--r-- | cmake/macros/FindOpenSSL.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/macros/FindOpenSSL.cmake b/cmake/macros/FindOpenSSL.cmake index f40a591f9a7..97fd3a5a2d6 100644 --- a/cmake/macros/FindOpenSSL.cmake +++ b/cmake/macros/FindOpenSSL.cmake @@ -128,9 +128,9 @@ if (WIN32) if(PLATFORM EQUAL 64) set(_OPENSSL_MSI_INSTALL_GUID "117551DB-A110-4BBD-BB05-CFE0BCB3ED31") set(_OPENSSL_ROOT_HINTS - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]" ${OPENSSL_ROOT_DIR} ENV OPENSSL_ROOT_DIR + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]" ) file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles) set(_OPENSSL_ROOT_PATHS @@ -142,9 +142,9 @@ if (WIN32) else() set(_OPENSSL_MSI_INSTALL_GUID "A1EEC576-43B9-4E75-9E02-03DA542D2A38") set(_OPENSSL_ROOT_HINTS - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]" ${OPENSSL_ROOT_DIR} ENV OPENSSL_ROOT_DIR + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]" ) file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles) set(_OPENSSL_ROOT_PATHS |