diff options
| author | fuzzard <fuzzard@kodi.tv> | 2023-08-13 16:13:36 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2023-09-01 14:17:00 +1000 |
| commit | f8573a7247e41cb5c1c7d738a898f5a88c40d348 (patch) | |
| tree | 96019353ed644712d0b6d954954b8204d60384fd | |
| parent | 241102716b083c6bdef68306e21a1bcc6280fcc6 (diff) | |
| download | xbmc-f8573a7247e41cb5c1c7d738a898f5a88c40d348.tar.xz | |
[cmake] wayland protocols generation explicit dependency of lib${APP_NAME_LC}
| -rw-r--r-- | cmake/platform/linux/wayland.cmake | 1 | ||||
| -rw-r--r-- | cmake/platform/linux/webos.cmake | 1 | ||||
| -rw-r--r-- | cmake/scripts/linux/ExtraTargets.cmake | 3 | ||||
| -rw-r--r-- | cmake/scripts/webos/ExtraTargets.cmake | 3 |
4 files changed, 6 insertions, 2 deletions
diff --git a/cmake/platform/linux/wayland.cmake b/cmake/platform/linux/wayland.cmake index 1adcd8fe77..be00c12bba 100644 --- 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 index aa6c5d1a27..c740ecd277 100644 --- 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 index 9be92f19d4..62c6a400b1 100644 --- 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 index 6eec896781..3380c6a3be 100644 --- 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) |