Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[glib] Use meson build system. #11477

Closed
wants to merge 17 commits into from
Closed

[glib] Use meson build system. #11477

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
594f290
glib: Use meson build system.
vlj May 20, 2020
135e341
glib: Fix atk so it uses python GLIB_GENMARSHAL.
vlj May 24, 2020
41bcefd
Use actual include path.
vlj May 25, 2020
20e724b
[glib] Fix atk CMakeLists.txt.
vlj May 25, 2020
a17179f
[glib] Fix glibmm.
vlj May 25, 2020
b066a1a
[gib] Fix gts.
vlj May 25, 2020
a1e7302
[glib] Fix libnice build.
vlj May 26, 2020
28aec49
[glib] Fix gdb-pixbuf build.
vlj May 26, 2020
56fd363
[glib] Fix libcroco build.
vlj May 26, 2020
28595c6
[glib]Fix pango build.
vlj May 26, 2020
0bd6734
[glib] Fix fluidsynth build.
vlj May 26, 2020
d153d1d
[glib] Fix libxmlpp build.
vlj May 26, 2020
c27509e
[glib] Fix gtk build.
vlj May 26, 2020
5e083ea
[glib] Fix atkmm, thanks to c72578.
vlj May 30, 2020
3415773
[glib]Fix gdbus-codegen.
vlj May 30, 2020
2455abf
[glib] Fix pangomm.
vlj May 31, 2020
d89f1ed
[glib] Fix gtkmm.
vlj May 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ports/atk/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,20 @@ endif()

# generate atkmarshal.c and atkmarshal.h source files
# glib-genmarshal should be installed along with glib
find_package (Python COMPONENTS Interpreter)
find_program(GLIB_GENMARSHAL glib-genmarshal PATH_SUFFIXES glib)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/atk)

message("Generating atkmarshal.h: ${GLIB_GENMARSHAL} --prefix=atk_marshal ${CMAKE_CURRENT_SOURCE_DIR}/atk/atkmarshal.list --header")
message("Generating atkmarshal.h: ${Python_EXECUTABLE} ${GLIB_GENMARSHAL} --prefix=atk_marshal ${CMAKE_CURRENT_SOURCE_DIR}/atk/atkmarshal.list --header")
execute_process(
COMMAND ${GLIB_GENMARSHAL} --prefix=atk_marshal ${CMAKE_CURRENT_SOURCE_DIR}/atk/atkmarshal.list --header
COMMAND ${Python_EXECUTABLE} ${GLIB_GENMARSHAL} --prefix=atk_marshal ${CMAKE_CURRENT_SOURCE_DIR}/atk/atkmarshal.list --header
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/atk
OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/atk/atkmarshal.h
)

message("Generating atkmarshal.c: ${GLIB_GENMARSHAL} --prefix=atk_marshal ${CMAKE_CURRENT_SOURCE_DIR}/atk/atkmarshal.list --body")
message("Generating atkmarshal.c: ${Python_EXECUTABLE} ${GLIB_GENMARSHAL} --prefix=atk_marshal ${CMAKE_CURRENT_SOURCE_DIR}/atk/atkmarshal.list --body")
execute_process(
COMMAND ${GLIB_GENMARSHAL} --prefix=atk_marshal ${CMAKE_CURRENT_SOURCE_DIR}/atk/atkmarshal.list --body
COMMAND ${Python_EXECUTABLE} ${GLIB_GENMARSHAL} --prefix=atk_marshal ${CMAKE_CURRENT_SOURCE_DIR}/atk/atkmarshal.list --body
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/atk
OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/atk/atkmarshal.c
)
Expand Down
4 changes: 4 additions & 0 deletions ports/atk/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ vcpkg_extract_source_archive_ex(
fix-linux-config.patch
)

vcpkg_find_acquire_program(PYTHON3)
get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
vcpkg_add_to_path("${PYTHON3_DIR}")

file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

vcpkg_configure_cmake(
Expand Down
362 changes: 0 additions & 362 deletions ports/glib/CMakeLists.txt
View file
Open in desktop

This file was deleted.

Loading