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

meson CI: Add OmniOS #3196

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

meson CI: Add OmniOS #3196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions .github/workflows/on_PR_meson.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,19 @@
meson setup "${{github.workspace}}/build" -Dwarning_level=3
meson compile -C "${{github.workspace}}/build" --verbose
meson test -C "${{github.workspace}}/build" --verbose
OmniOS:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: vmactions/omnios-vm@v1
with:
prepare: |
pkg install brotli cmake curl expat gcc14 meson-312 ninja pkg-config python-312
run: |
/usr/lib/python3.12/bin/meson setup "${{github.workspace}}/build" -Dwarning_level=3 -DunitTests=enabled -Dinih=enabled
/usr/lib/python3.12/bin/meson compile -C "${{github.workspace}}/build" --verbose
/usr/lib/python3.12/bin/meson test -C "${{github.workspace}}/build" --verbose
Emscripten:

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions Job or Workflow does not set permissions
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
7 changes: 5 additions & 2 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,11 @@ cdata.set('EXV_HAVE_LENSDATA', get_option('lensdata'))
cdata.set('EXV_ENABLE_VIDEO', get_option('video'))

deps = []
deps += cpp.find_library('ws2_32', required: host_machine.system() == 'windows')
deps += cpp.find_library('procstat', required: host_machine.system() == 'freebsd')
foreach d, os : {'procstat': 'freebsd', 'socket': 'sunos', 'ws2_32': 'windows'}
if host_machine.system() == os
deps += cpp.find_library(d)
endif
endforeach

fmt_dep = []
if not cpp.has_header_symbol('format', 'std::format')
Expand Down
14 changes: 5 additions & 9 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,19 +236,15 @@ if(WIN32)
# Since windows.h is included in some headers, we need to propagate this definition
target_compile_definitions(exiv2lib PUBLIC WIN32_LEAN_AND_MEAN)
set_target_properties(exiv2lib PROPERTIES DEBUG_POSTFIX d)
endif()

if(NOT MSVC)
target_link_libraries(exiv2lib PRIVATE psapi ws2_32 shell32)
else()
if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
target_link_libraries(exiv2lib PRIVATE -lprocstat)
target_link_libraries(exiv2lib PRIVATE procstat)
endif()

if(MINGW)
target_link_libraries(exiv2lib PRIVATE psapi ws2_32 shell32)
if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
target_link_libraries(exiv2lib PRIVATE socket)
endif()

else()
target_link_libraries(exiv2lib PRIVATE psapi ws2_32 shell32)
endif()

if(NOT EXV_HAVE_STD_FORMAT)
Expand Down
Loading