mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-21 06:00:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindZLIB: Fix path detection via ProgramFiles env variables

Browse Source
This commit is contained in:
Andreas Schneider
2018-08-13 21:53:17 +02:00
parent e33c6c357b
commit fbbc6e2eef
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/FindZLIB.cmake
View File

@@ -58,10 +58,12 @@ if(ZLIB_ROOT)
endif() endif()
# Normal search. # Normal search.
set(_ZLIB_x86 "(x86)")
set(_ZLIB_SEARCH_NORMAL set(_ZLIB_SEARCH_NORMAL
PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]" PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]"
"$ENV{PROGRAMFILES}/zlib" "$ENV{ProgramFiles}/zlib"
) "$ENV{ProgramFiles${_ZLIB_x86}}/zlib")
unset(_ZLIB_x86)
list(APPEND _ZLIB_SEARCHES _ZLIB_SEARCH_NORMAL) list(APPEND _ZLIB_SEARCHES _ZLIB_SEARCH_NORMAL)
set(ZLIB_NAMES z zlib zdll zlib1) set(ZLIB_NAMES z zlib zdll zlib1)