Changeset 275608 in webkit

Timestamp:

Apr 7, 2021 9:26:36 AM (3 years ago)

Author:

don.olmstead@sony.com

Message:

[CMake] Mark _LIBRARY not _LIBRARIES in find modules
​https://bugs.webkit.org/show_bug.cgi?id=224283

Reviewed by Michael Catanzaro.

A few find modules are erroniously sending _LIBRARIES to mark_as_advanced rather than
_LIBRARY. The former is created from the _LIBRARY value so it isn't valid at that point.

• Source/cmake/FindCairo.cmake:
• Source/cmake/FindFontconfig.cmake:
• Source/cmake/FindSQLite3.cmake:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/FindCairo.cmake (modified) (1 diff)
• Source/cmake/FindFontconfig.cmake (modified) (1 diff)
• Source/cmake/FindSQLite3.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2021-04-07  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Mark _LIBRARY not _LIBRARIES in find modules
+        https://bugs.webkit.org/show_bug.cgi?id=224283
+
+        Reviewed by Michael Catanzaro.
+
+        A few find modules are erroniously sending _LIBRARIES to mark_as_advanced rather than
+        _LIBRARY. The former is created from the _LIBRARY value so it isn't valid at that point.
+
+        * Source/cmake/FindCairo.cmake:
+        * Source/cmake/FindFontconfig.cmake:
+        * Source/cmake/FindSQLite3.cmake:
+
 2021-04-07  Kimmo Kinnunen  <kkinnunen@apple.com>
 

trunk/Source/cmake/FindCairo.cmake

@@ -102 +102 @@
 endif ()
 
-mark_as_advanced(Cairo_INCLUDE_DIR Cairo_LIBRARIES)
+mark_as_advanced(Cairo_INCLUDE_DIR Cairo_LIBRARY)
 
 if (Cairo_FOUND)

trunk/Source/cmake/FindFontconfig.cmake

@@ -104 +104 @@
 endif ()
 
-mark_as_advanced(Fontconfig_INCLUDE_DIR Fontconfig_LIBRARIES)
+mark_as_advanced(Fontconfig_INCLUDE_DIR Fontconfig_LIBRARY)
 
 if (Fontconfig_FOUND)

trunk/Source/cmake/FindSQLite3.cmake

@@ -97 +97 @@
 endif ()
 
-mark_as_advanced(SQLite3_INCLUDE_DIR SQLite3_LIBRARIES)
+mark_as_advanced(SQLite3_INCLUDE_DIR SQLite3_LIBRARY)
 
 if (SQLite3_FOUND)