mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-29 04:09:35 +03:00
Code Activity

FindZLIB: Fix path detection via ProgramFiles env variables

Browse Source
This commit is contained in:
Andreas Schneider committed 2018-08-24 07:24:00 +02:00
1 parent e33c6c357b
commit fbbc6e2eef
1 file changed
+5 -3
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)