From 96d69f646b0024d2619a00db0d18f4acf0bfb08a Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Mon, 15 May 2023 13:58:43 +0400 Subject: [PATCH] Fix build with DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION --- external/glib/generate_dbus.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/external/glib/generate_dbus.cmake b/external/glib/generate_dbus.cmake index 663a344..77ee46e 100644 --- a/external/glib/generate_dbus.cmake +++ b/external/glib/generate_dbus.cmake @@ -10,7 +10,8 @@ include(${cmake_helpers_loc}/external/glib/generate_cppgir.cmake) function(generate_dbus target_name interface_prefix namespace interface_file) find_program(DESKTOP_APP_GDBUSCODEGEN gdbus-codegen REQUIRED) - set(gen_dst ${CMAKE_CURRENT_BINARY_DIR}/gen) + set(gen_loc ${CMAKE_CURRENT_BINARY_DIR}/gen) + set(gen_dst ${gen_loc}/dbus) file(MAKE_DIRECTORY ${gen_dst}) set(gen_timestamp ${gen_dst}/${target_name}_${namespace}_dbus.timestamp) @@ -44,7 +45,7 @@ function(generate_dbus target_name interface_prefix namespace interface_file) add_library(${target_name}_${namespace}_dbus STATIC) init_target(${target_name}_${namespace}_dbus "(gen)") target_link_libraries(${target_name}_${namespace}_dbus PUBLIC desktop-app::external_glib) - generate_target(${target_name}_${namespace}_dbus timestamp ${gen_timestamp} "${gen_files}" ${gen_dst}) + generate_target(${target_name}_${namespace}_dbus timestamp ${gen_timestamp} "${gen_files}" ${gen_loc}) add_library(${target_name}_${namespace} INTERFACE) init_target_folder(${target_name}_${namespace} "(gen)")