echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'FindZLIB-no-components'

Browse Source 
cf612440dc FindZLIB: Fail if components are requested as it does not provide any

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7767
This commit is contained in:
Brad King 2022-10-14 13:08:18 +00:00 committed by Kitware Robot
commit 83663325f6
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Modules/FindZLIB.cmake
View File

@ -60,6 +60,14 @@ module where to look.
#]=======================================================================]
if(ZLIB_FIND_COMPONENTS AND NOT ZLIB_FIND_QUIETLY)
message(AUTHOR_WARNING
"ZLIB does not provide any COMPONENTS. Calling\n"
" find_package(ZLIB COMPONENTS ...)\n"
"will always fail."
)
endif()
set(_ZLIB_SEARCHES)
# Search ZLIB_ROOT first if it is set.
@ -164,7 +172,8 @@ endif()
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB REQUIRED_VARS ZLIB_LIBRARY ZLIB_INCLUDE_DIR
VERSION_VAR ZLIB_VERSION_STRING)
VERSION_VAR ZLIB_VERSION_STRING
HANDLE_COMPONENTS)
if(ZLIB_FOUND)
set(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})