Skip to content

Commit

Permalink
Merge branch 'Exiv2:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
LeoHsiao1 authored Oct 5, 2024
2 parents 57a5559 + 4173969 commit 27b83d2
Show file tree
Hide file tree
Showing 74 changed files with 459 additions and 709 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/on_PR_mac_special_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ jobs:
- name: Test
run: |
ctest --test-dir build --output-on-failure
ASAN_OPTIONS=detect_container_overflow=0 ctest --test-dir build --output-on-failure
2 changes: 1 addition & 1 deletion .github/workflows/on_PR_meson.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
name: Linux-Clang${{matrix.cxx}}-deps=${{matrix.deps}}
strategy:
matrix:
cxx: ['7', '18']
cxx: ['7', '19']
deps: ['forcefallback', 'default']
steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/on_push_BasicWinLinMac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ jobs:
strategy:
matrix:
runner:
- { os: macos-12, arch: X64 }
- { os: macos-14, arch: ARM64 }
- { os: macos-13, arch: X64 }
- { os: macos-latest, arch: ARM64 }

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_push_clang_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: DoozyX/clang-format-lint-action@v0.17
- uses: DoozyX/clang-format-lint-action@v0.18
with:
source: '.'
exclude: './xmpsdk ./contrib'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,7 @@ All project resources are accessible from the project website.
## License
Copyright (C) 2004-2023 Exiv2 authors.
Copyright (C) 2004-2024 Exiv2 authors.
You should have received a copy of the file [COPYING](COPYING) which details the GPLv2 license.
Exiv2 is free software; you can redistribute it and/or modify
Expand Down
32 changes: 10 additions & 22 deletions app/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
set(APP_SOURCES
exiv2.cpp
exiv2app.hpp
actions.cpp
actions.hpp
getopt.cpp
getopt.hpp
app_utils.cpp
app_utils.hpp
)

add_executable(exiv2 ${APP_SOURCES})

# Make app use UTF-8 code page in Windows
if(WIN32)
if(MSVC)
target_sources(exiv2 PRIVATE utf8.manifest)
else()
# Must wrap manifest in .rc w/ other toolchains
target_sources(exiv2 PRIVATE utf8.rc)
endif()
endif()

target_include_directories(exiv2 PRIVATE ${PROJECT_SOURCE_DIR}/src) # To find i18n.hpp

set_target_properties(exiv2 PROPERTIES COMPILE_FLAGS ${EXTRA_COMPILE_FLAGS} XCODE_ATTRIBUTE_GCC_GENERATE_DEBUGGING_SYMBOLS[variant=Debug] "YES")
Expand All @@ -27,24 +33,6 @@ endif()

target_link_libraries(exiv2 PRIVATE std::filesystem)

if(MSVC OR MINGW)
# Trick to get properly UTF-8 encoded argv.

# More info at: https://github.com/huangqinjin/wmain
add_library(wmain STATIC wmain.cpp)
target_link_libraries(exiv2 PRIVATE wmain)
endif()

if(MSVC)
target_link_options(wmain INTERFACE /WHOLEARCHIVE:$<TARGET_FILE:wmain>)
target_link_options(exiv2 PRIVATE "/ENTRY:wWinMainCRTStartup")
endif()

if(MINGW)
target_compile_options(exiv2 PRIVATE -municode)
target_link_options(exiv2 PRIVATE -municode)
endif()

if(USING_CONAN
AND WIN32
AND EXISTS ${PROJECT_BINARY_DIR}/conanDlls
Expand Down
Loading

0 comments on commit 27b83d2

Please sign in to comment.