summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-02-16 15:40:40 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-02-16 15:41:26 (GMT)
commite6d6cf90223635da7c8c01ba21c62b681d55076c (patch)
treebb0deb5242b2ae494b6c7939375268aa107b121f
parent516c0736e8cc5f57f8c85c182b14040bfe590e5d (diff)
parent17ae4e1befb0e9a81b70e1792a4ae50a2fee8183 (diff)
downloadCMake-e6d6cf90223635da7c8c01ba21c62b681d55076c.zip
CMake-e6d6cf90223635da7c8c01ba21c62b681d55076c.tar.gz
CMake-e6d6cf90223635da7c8c01ba21c62b681d55076c.tar.bz2
Merge topic 'FindPNG-advanced-variables' into release-3.20
17ae4e1bef FindPNG: only mark used variables as advanced Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5809
-rw-r--r--Modules/FindPNG.cmake3
1 files changed, 1 insertions, 2 deletions
diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake
index 51f2c7d..94d15db 100644
--- a/Modules/FindPNG.cmake
+++ b/Modules/FindPNG.cmake
@@ -55,6 +55,7 @@ find_package(ZLIB ${_FIND_ZLIB_ARG})
if(ZLIB_FOUND)
find_path(PNG_PNG_INCLUDE_DIR png.h PATH_SUFFIXES include/libpng)
+ mark_as_advanced(PNG_PNG_INCLUDE_DIR)
list(APPEND PNG_NAMES png libpng)
unset(PNG_NAMES_DEBUG)
@@ -158,5 +159,3 @@ include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
find_package_handle_standard_args(PNG
REQUIRED_VARS PNG_LIBRARY PNG_PNG_INCLUDE_DIR
VERSION_VAR PNG_VERSION_STRING)
-
-mark_as_advanced(PNG_PNG_INCLUDE_DIR PNG_LIBRARY )