From fbbc6e2eef37bd3630b6c3a7571533f81070725d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 13 Aug 2018 21:53:17 +0200 Subject: FindZLIB: Fix path detection via ProgramFiles env variables --- Modules/FindZLIB.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Modules') diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake index a5c04aca27..1a4635a7d6 100644 --- a/Modules/FindZLIB.cmake +++ b/Modules/FindZLIB.cmake @@ -58,10 +58,12 @@ if(ZLIB_ROOT) endif() # Normal search. +set(_ZLIB_x86 "(x86)") set(_ZLIB_SEARCH_NORMAL - PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]" - "$ENV{PROGRAMFILES}/zlib" - ) + PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]" + "$ENV{ProgramFiles}/zlib" + "$ENV{ProgramFiles${_ZLIB_x86}}/zlib") +unset(_ZLIB_x86) list(APPEND _ZLIB_SEARCHES _ZLIB_SEARCH_NORMAL) set(ZLIB_NAMES z zlib zdll zlib1) -- cgit v1.2.1