[CMake] Some options should be marked as advanced
authormcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 25 Apr 2018 19:58:53 +0000 (19:58 +0000)
committermcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 25 Apr 2018 19:58:53 +0000 (19:58 +0000)
https://bugs.webkit.org/show_bug.cgi?id=184972

Reviewed by Konstantin Tokarev.

* Source/cmake/FindLibGcrypt.cmake:
* Source/cmake/FindWebP.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231012 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/cmake/FindLibGcrypt.cmake
Source/cmake/FindWebP.cmake

index 8e99022..57222c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2018-04-25  Michael Catanzaro  <mcatanzaro@igalia.com>
 
+        [CMake] Some options should be marked as advanced
+        https://bugs.webkit.org/show_bug.cgi?id=184972
+
+        Reviewed by Konstantin Tokarev.
+
+        * Source/cmake/FindLibGcrypt.cmake:
+        * Source/cmake/FindWebP.cmake:
+
+2018-04-25  Michael Catanzaro  <mcatanzaro@igalia.com>
+
         [GTK] Miscellaneous build cleanups
         https://bugs.webkit.org/show_bug.cgi?id=184399
 
index f295682..1a3d4a5 100644 (file)
@@ -81,7 +81,7 @@ if (LIBGCRYPT_FOUND)
     set(LIBGCRYPT_INCLUDE_DIRS ${LIBGCRYPT_INCLUDE_DIR})
 endif ()
 
-mark_as_advanced(LIBGCRYPT_LIBRARY LIBGCRYPT_INCLUDE_DIR)
+mark_as_advanced(LIBGCRYPT_LIBRARY LIBGCRYPT_INCLUDE_DIR LIBGCRYPTCONFIG_SCRIPT)
 
 include(FeatureSummary)
 set_package_properties(LibGcrypt PROPERTIES
index 81e8aa3..8defa22 100644 (file)
@@ -47,7 +47,6 @@ find_library(
     HINTS ${PC_WEBP_LIBDIR} ${PC_WEBP_LIBRARY_DIRS}
 )
 list(APPEND WEBP_LIBRARIES ${WEBP_LIBRARY})
-mark_as_advanced(WEBP_LIBRARIES)
 
 find_path(WEBP_DEMUX_INCLUDE_DIR
     NAMES webp/demux.h
@@ -61,6 +60,8 @@ find_library(WEBP_DEMUX_LIBRARY
 )
 list(APPEND WEBP_LIBRARIES ${WEBP_DEMUX_LIBRARY})
 
+mark_as_advanced(WEBP_DEMUX_INCLUDE_DIR WEBP_DEMUX_LIBRARY WEBP_INCLUDE_DIR WEBP_LIBRARY WEBP_LIBRARIES)
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(WebP REQUIRED_VARS WEBP_INCLUDE_DIRS WEBP_LIBRARIES
                                   FOUND_VAR WEBP_FOUND)