mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 22:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'FindZLIB-ProgramFiles'

Browse Source 
fbbc6e2eef FindZLIB: Fix path detection via ProgramFiles env variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: RElesgoe <relesgoe@gmail.com>
Merge-request: !2287
This commit is contained in:
Brad King
2018-08-27 18:02:46 +00:00
committed by Kitware Robot
parent 07556f1567 fbbc6e2eef
commit 4a1b18db55
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/FindZLIB.cmake
+5 -3
View File
@@ -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)