[cmake] wayland protocols generation explicit dependency of lib${APP_…

…NAME_LC}
thexai · Sep 1, 2023 · f8573a7 · f8573a7
1 parent 2411027
commit f8573a7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/cmake/platform/linux/wayland.cmake b/cmake/platform/linux/wayland.cmake
@@ -7,7 +7,6 @@ elseif(APP_RENDER_SYSTEM STREQUAL "gles")
   list(APPEND PLATFORM_REQUIRED_DEPS OpenGLES EGL)
 endif()
 
-set(PLATFORM_GLOBAL_TARGET_DEPS generate-wayland-extra-protocols)
 set(WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 
 # for wayland-extra-protocols.hpp

diff --git a/cmake/platform/linux/webos.cmake b/cmake/platform/linux/webos.cmake
@@ -5,7 +5,6 @@ include(${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/wayland.cmake)
 list(APPEND CORE_PLATFORM_NAME_LC wayland)
 
 list(APPEND PLATFORM_REQUIRED_DEPS WaylandProtocolsWebOS PlayerAPIs PlayerFactory WebOSHelpers)
-list(APPEND PLATFORM_GLOBAL_TARGET_DEPS generate-wayland-webos-protocols)
 list(APPEND ARCH_DEFINES -DTARGET_WEBOS)
 set(ENABLE_PULSEAUDIO OFF CACHE BOOL "" FORCE)
 set(TARGET_WEBOS TRUE)

diff --git a/cmake/scripts/linux/ExtraTargets.cmake b/cmake/scripts/linux/ExtraTargets.cmake
@@ -34,4 +34,7 @@ if("wayland" IN_LIST CORE_PLATFORM_NAME_LC)
 
   # Dummy target for dependencies
   add_custom_target(generate-wayland-extra-protocols DEPENDS wayland-extra-protocols.hpp)
+  # ToDo: turn this into a TARGET OBJECT. For now, a custum target doesnt play nice with
+  # our PLATFORM_GLOBAL_TARGET_DEPS usage in macros
+  add_dependencies(lib${APP_NAME_LC} generate-wayland-extra-protocols)
 endif()
diff --git a/cmake/scripts/webos/ExtraTargets.cmake b/cmake/scripts/webos/ExtraTargets.cmake
@@ -7,3 +7,6 @@ add_custom_command(OUTPUT "${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}/wayland-webos
                   DEPENDS "${WAYLANDPP_SCANNER}" ${WEBOS_PROTOCOL_XMLS}
                   COMMENT "Generating wayland-webos C++ wrappers")
 add_custom_target(generate-wayland-webos-protocols DEPENDS wayland-webos-protocols.hpp)
+# ToDo: turn this into a TARGET OBJECT. For now, a custum target doesnt play nice with
+# our PLATFORM_GLOBAL_TARGET_DEPS usage in macros
+add_dependencies(lib${APP_NAME_LC} generate-wayland-webos-protocols)