From 8714461f776e24bc2a7b8fa1898fb658db806d7e Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 4 Aug 2023 19:00:52 +0400 Subject: [PATCH] Update cppgir to the namespaced targets --- external/glib/cppgir | 2 +- external/glib/generate_cppgir.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/external/glib/cppgir b/external/glib/cppgir index 82fd185..ef6d50a 160000 --- a/external/glib/cppgir +++ b/external/glib/cppgir @@ -1 +1 @@ -Subproject commit 82fd18518cea24eeba8dcbe3909c72498935457c +Subproject commit ef6d50ababb13ab7c9a13cc46d3500d6e02a98f2 diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake index 1a6b41e..e084f1e 100644 --- a/external/glib/generate_cppgir.cmake +++ b/external/glib/generate_cppgir.cmake @@ -20,7 +20,7 @@ function(generate_cppgir target_name gir) OUTPUT ${gen_timestamp} COMMAND - cppgir + CppGir::cppgir --debug 1 --class @@ -35,17 +35,17 @@ function(generate_cppgir target_name gir) echo 1> ${gen_timestamp} COMMENT "Generating C++ wrapper for ${gir} (${target_name})" DEPENDS - cppgir + CppGir::cppgir ${gir_path} ) generate_target(${target_name} cppgir ${gen_timestamp} "" ${gen_dst}) get_target_property(target_type ${target_name} TYPE) if (${target_type} STREQUAL "INTERFACE_LIBRARY") - target_link_libraries(${target_name} INTERFACE gi) + target_link_libraries(${target_name} INTERFACE CppGir::gi) target_compile_definitions(${target_name} INTERFACE GI_INLINE GI_OBJECT_NEWV) else() - target_link_libraries(${target_name} PUBLIC gi) + target_link_libraries(${target_name} PUBLIC CppGir::gi) target_compile_definitions(${target_name} PUBLIC GI_INLINE GI_OBJECT_NEWV) endif() endfunction()