Title: [275608] trunk
- Revision
- 275608
- Author
- [email protected]
- Date
- 2021-04-07 09:26:36 -0700 (Wed, 07 Apr 2021)
Log 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:
Modified Paths
Diff
Modified: trunk/ChangeLog (275607 => 275608)
--- trunk/ChangeLog 2021-04-07 15:54:58 UTC (rev 275607)
+++ trunk/ChangeLog 2021-04-07 16:26:36 UTC (rev 275608)
@@ -1,3 +1,17 @@
+2021-04-07 Don Olmstead <[email protected]>
+
+ [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 <[email protected]>
.gitignore contains 'build/' which causes all directories named 'build/' to be ignored
Modified: trunk/Source/cmake/FindCairo.cmake (275607 => 275608)
--- trunk/Source/cmake/FindCairo.cmake 2021-04-07 15:54:58 UTC (rev 275607)
+++ trunk/Source/cmake/FindCairo.cmake 2021-04-07 16:26:36 UTC (rev 275608)
@@ -101,7 +101,7 @@
)
endif ()
-mark_as_advanced(Cairo_INCLUDE_DIR Cairo_LIBRARIES)
+mark_as_advanced(Cairo_INCLUDE_DIR Cairo_LIBRARY)
if (Cairo_FOUND)
set(Cairo_LIBRARIES ${Cairo_LIBRARY})
Modified: trunk/Source/cmake/FindFontconfig.cmake (275607 => 275608)
--- trunk/Source/cmake/FindFontconfig.cmake 2021-04-07 15:54:58 UTC (rev 275607)
+++ trunk/Source/cmake/FindFontconfig.cmake 2021-04-07 16:26:36 UTC (rev 275608)
@@ -103,7 +103,7 @@
)
endif ()
-mark_as_advanced(Fontconfig_INCLUDE_DIR Fontconfig_LIBRARIES)
+mark_as_advanced(Fontconfig_INCLUDE_DIR Fontconfig_LIBRARY)
if (Fontconfig_FOUND)
set(Fontconfig_LIBRARIES ${Fontconfig_LIBRARY})
Modified: trunk/Source/cmake/FindSQLite3.cmake (275607 => 275608)
--- trunk/Source/cmake/FindSQLite3.cmake 2021-04-07 15:54:58 UTC (rev 275607)
+++ trunk/Source/cmake/FindSQLite3.cmake 2021-04-07 16:26:36 UTC (rev 275608)
@@ -96,7 +96,7 @@
)
endif ()
-mark_as_advanced(SQLite3_INCLUDE_DIR SQLite3_LIBRARIES)
+mark_as_advanced(SQLite3_INCLUDE_DIR SQLite3_LIBRARY)
if (SQLite3_FOUND)
set(SQLite3_LIBRARIES ${SQLite3_LIBRARY})
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
