Changeset 245940 in webkit

Timestamp:

May 30, 2019 5:46:38 PM (5 years ago)

Author:

don.olmstead@sony.com

Message:

[CMake] Add WEBKIT_FRAMEWORK_TARGET macro
​https://bugs.webkit.org/show_bug.cgi?id=198396

Reviewed by Konstantin Tokarev.

.:

Add a macro to help create the WebKit::targets in CMake.

• CMakeLists.txt:
• Source/cmake/WebKitMacros.cmake:

Source/bmalloc:

Use WEBKIT_FRAMEWORK_TARGET.

• CMakeLists.txt:

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• Source/bmalloc/CMakeLists.txt (modified) (2 diffs)
• Source/bmalloc/ChangeLog (modified) (1 diff)
• Source/cmake/WebKitMacros.cmake (modified) (1 diff)

trunk/CMakeLists.txt

@@ -140 +140 @@
 # shared, because properly building shared libraries that depend on each other
 # can be tricky. Override these in Options*.cmake for your port as needed.
+set(bmalloc_LIBRARY_TYPE STATIC)
 set(WTF_LIBRARY_TYPE STATIC)
 set(JavaScriptCore_LIBRARY_TYPE STATIC)

trunk/ChangeLog

@@ +1 @@
+2019-05-30  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Add WEBKIT_FRAMEWORK_TARGET macro
+        https://bugs.webkit.org/show_bug.cgi?id=198396
+
+        Reviewed by Konstantin Tokarev.
+
+        Add a macro to help create the WebKit::targets in CMake.
+
+        * CMakeLists.txt:
+        * Source/cmake/WebKitMacros.cmake:
+
 2019-05-29  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/bmalloc/CMakeLists.txt

@@ -142 +142 @@
 )
 
+set(bmalloc_INTERFACE_LIBRARIES bmalloc)
+set(bmalloc_INTERFACE_INCLUDE_DIRECTORIES ${bmalloc_FRAMEWORK_HEADERS_DIR})
+set(bmalloc_INTERFACE_DEPENDENCIES bmalloc_CopyHeaders)
+
+set(mbmalloc_LIBRARIES bmalloc)
+
+WEBKIT_FRAMEWORK_DECLARE(bmalloc)
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
-
-WEBKIT_WRAP_SOURCELIST(${bmalloc_SOURCES})
-
-add_library(bmalloc STATIC ${bmalloc_SOURCES})
-target_include_directories(bmalloc PRIVATE ${bmalloc_PRIVATE_INCLUDE_DIRECTORIES})
-target_include_directories(bmalloc INTERFACE "$<BUILD_INTERFACE:${bmalloc_FRAMEWORK_HEADERS_DIR}>")
-target_link_libraries(bmalloc ${bmalloc_LIBRARIES})
-set_target_properties(bmalloc PROPERTIES COMPILE_DEFINITIONS "BUILDING_bmalloc")
 
 WEBKIT_COPY_FILES(bmalloc_CopyHeaders
@@ -157 +156 @@
 )
 
-add_library(bmalloc_PostBuild INTERFACE)
-target_link_libraries(bmalloc_PostBuild INTERFACE bmalloc)
-add_dependencies(bmalloc_PostBuild bmalloc_CopyHeaders)
-
-add_library(WebKit::bmalloc ALIAS bmalloc_PostBuild)
+WEBKIT_WRAP_SOURCELIST(${bmalloc_SOURCES})
+WEBKIT_FRAMEWORK(bmalloc)
+WEBKIT_FRAMEWORK_TARGET(bmalloc)
 
 if (DEVELOPER_MODE)
     add_library(mbmalloc SHARED bmalloc/mbmalloc.cpp)
     target_include_directories(mbmalloc PRIVATE ${bmalloc_PRIVATE_INCLUDE_DIRECTORIES})
-    target_link_libraries(mbmalloc bmalloc ${CMAKE_THREAD_LIBS_INIT} ${bmalloc_LIBRARIES})
+    target_link_libraries(mbmalloc ${CMAKE_THREAD_LIBS_INIT} ${mbmalloc_LIBRARIES} ${bmalloc_LIBRARIES})
     set_target_properties(mbmalloc PROPERTIES COMPILE_DEFINITIONS "BUILDING_mbmalloc")
 endif ()

trunk/Source/bmalloc/ChangeLog

@@ +1 @@
+2019-05-30  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Add WEBKIT_FRAMEWORK_TARGET macro
+        https://bugs.webkit.org/show_bug.cgi?id=198396
+
+        Reviewed by Konstantin Tokarev.
+
+        Use WEBKIT_FRAMEWORK_TARGET.
+
+        * CMakeLists.txt:
+
 2019-05-30  Keith Miller  <keith_miller@apple.com>
 

trunk/Source/cmake/WebKitMacros.cmake

@@ -196 +196 @@
         install(TARGETS ${_target} FRAMEWORK DESTINATION ${LIB_INSTALL_DIR})
     endif ()
+endmacro()
+
+# FIXME Move into WEBKIT_FRAMEWORK after all libraries are using this macro
+macro(WEBKIT_FRAMEWORK_TARGET _target)
+    add_library(${_target}_PostBuild INTERFACE)
+    target_link_libraries(${_target}_PostBuild INTERFACE ${${_target}_INTERFACE_LIBRARIES})
+    target_include_directories(${_target}_PostBuild INTERFACE ${${_target}_INTERFACE_INCLUDE_DIRECTORIES})
+    add_dependencies(${_target}_PostBuild ${${_target}_INTERFACE_DEPENDENCIES})
+    add_library(WebKit::${_target} ALIAS ${_target}_PostBuild)
 endmacro()