Skip to content

Commit

Permalink
Look for system-wide cppgir before fallback to the bundled copy
Browse files Browse the repository at this point in the history
Closes: #282
  • Loading branch information
mymedia2 committed Jan 8, 2024
1 parent 4005d7b commit a5c42e0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
4 changes: 3 additions & 1 deletion external/glib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ function(add_cppgir) # isolate scope
set(BUILD_EXAMPLES OFF)
add_subdirectory(cppgir EXCLUDE_FROM_ALL)
endfunction()
add_cppgir()

include(generate_cppgir.cmake)
if (NOT CppGir_FOUND)
add_cppgir()
endif()
generate_cppgir(external_glib Gio-2.0)

find_package(PkgConfig REQUIRED)
Expand Down
7 changes: 6 additions & 1 deletion external/glib/generate_cppgir.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
# For license and copyright information please follow this link:
# https://github.com/desktop-app/legal/blob/master/LEGAL

find_package(CppGir 2.0)

function(generate_cppgir target_name gir)
set(cppgir_loc ${cmake_helpers_loc}/external/glib/cppgir)

Expand All @@ -17,6 +19,9 @@ function(generate_cppgir target_name gir)
${cppgir_loc}/data/cppgir.ignore
${cppgir_loc}/data/cppgir_unix.ignore
)
if (CppGir_FOUND)
set(ignore_files) # rely on default ignore list
endif()

set(gir_path)
if (IS_ABSOLUTE "${gir}")
Expand All @@ -33,7 +38,7 @@ function(generate_cppgir target_name gir)
--class
--class-full
--expected
--ignore
"$<$<BOOL:${ignore_files}>:--ignore>"
"$<JOIN:${ignore_files},:>"
--output
${gen_dst}
Expand Down

0 comments on commit a5c42e0

Please sign in to comment.