Title: [231012] trunk
- Revision
- 231012
- Author
- [email protected]
- Date
- 2018-04-25 12:58:53 -0700 (Wed, 25 Apr 2018)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/ChangeLog (231011 => 231012)
--- trunk/ChangeLog 2018-04-25 19:55:11 UTC (rev 231011)
+++ trunk/ChangeLog 2018-04-25 19:58:53 UTC (rev 231012)
@@ -1,5 +1,15 @@
2018-04-25 Michael Catanzaro <[email protected]>
+ [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 <[email protected]>
+
[GTK] Miscellaneous build cleanups
https://bugs.webkit.org/show_bug.cgi?id=184399
Modified: trunk/Source/cmake/FindLibGcrypt.cmake (231011 => 231012)
--- trunk/Source/cmake/FindLibGcrypt.cmake 2018-04-25 19:55:11 UTC (rev 231011)
+++ trunk/Source/cmake/FindLibGcrypt.cmake 2018-04-25 19:58:53 UTC (rev 231012)
@@ -81,7 +81,7 @@
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
Modified: trunk/Source/cmake/FindWebP.cmake (231011 => 231012)
--- trunk/Source/cmake/FindWebP.cmake 2018-04-25 19:55:11 UTC (rev 231011)
+++ trunk/Source/cmake/FindWebP.cmake 2018-04-25 19:58:53 UTC (rev 231012)
@@ -47,7 +47,6 @@
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 @@
)
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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
