Changeset 263829 in webkit

Timestamp:

Jul 1, 2020, 7:58:07 PM (6 years ago)

Author:

don.olmstead@sony.com

Message:

[CMake] Add WOFF2 targets
​https://bugs.webkit.org/show_bug.cgi?id=213865

Reviewed by Fujii Hironori.

.:

Rework the Find module for WOFF2 to provide targets for libwoff2common and
libwoff2dec. Previously only libwoff2dec was specified in the find module. This
is because pkg-config works on that platform and because shared libraries are
supported. Neither is true for Windows so the module was expanded in anticipation
of support for WinCairo.

• Source/cmake/FindWOFF2.cmake: Added.
• Source/cmake/FindWOFF2Dec.cmake: Removed.
• Source/cmake/OptionsGTK.cmake:
• Source/cmake/OptionsWPE.cmake:

Source/WebCore:

Use the WOFF:: targets when USE_WOFF2 is set.

• CMakeLists.txt:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebCore/CMakeLists.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/cmake/FindWOFF2.cmake (added)
• Source/cmake/FindWOFF2Dec.cmake (deleted)
• Source/cmake/OptionsGTK.cmake (modified) (1 diff)
• Source/cmake/OptionsWPE.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2020-07-01  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Add WOFF2 targets
+        https://bugs.webkit.org/show_bug.cgi?id=213865
+
+        Reviewed by Fujii Hironori.
+
+        Rework the Find module for WOFF2 to provide targets for libwoff2common and
+        libwoff2dec. Previously only libwoff2dec was specified in the find module. This
+        is because pkg-config works on that platform and because shared libraries are
+        supported. Neither is true for Windows so the module was expanded in anticipation
+        of support for WinCairo.
+
+        * Source/cmake/FindWOFF2.cmake: Added.
+        * Source/cmake/FindWOFF2Dec.cmake: Removed.
+        * Source/cmake/OptionsGTK.cmake:
+        * Source/cmake/OptionsWPE.cmake:
+
 2020-06-30  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Source/WebCore/CMakeLists.txt

@@ -1551 +1551 @@
 
 if (USE_WOFF2)
-  list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES "${WOFF2DEC_INCLUDE_DIRS}")
-  list(APPEND WebCore_LIBRARIES "${WOFF2DEC_LIBRARIES}")
+  list(APPEND WebCore_LIBRARIES WOFF2::dec)
 endif ()
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-01  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Add WOFF2 targets
+        https://bugs.webkit.org/show_bug.cgi?id=213865
+
+        Reviewed by Fujii Hironori.
+
+        Use the WOFF:: targets when USE_WOFF2 is set.
+
+        * CMakeLists.txt:
+
 2020-07-01  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/cmake/OptionsGTK.cmake

@@ -413 +413 @@
 
 if (USE_WOFF2)
-    find_package(WOFF2Dec 1.0.2)
-    if (NOT WOFF2DEC_FOUND)
+    find_package(WOFF2 1.0.2 COMPONENTS dec)
+    if (NOT WOFF2_FOUND)
        message(FATAL_ERROR "libwoff2dec is needed for USE_WOFF2.")
     endif ()

trunk/Source/cmake/OptionsWPE.cmake

@@ -144 +144 @@
 
 if (USE_WOFF2)
-    find_package(WOFF2Dec 1.0.2)
-    if (NOT WOFF2DEC_FOUND)
+    find_package(WOFF2 1.0.2 COMPONENTS dec)
+    if (NOT WOFF2_FOUND)
         message(FATAL_ERROR "liwoff2dec is needed for USE_WOFF2.")
     endif ()