From 1ff1045b229e322e365d87e3e935e44a10288456 Mon Sep 17 00:00:00 2001 From: Go Kudo Date: Thu, 6 Mar 2025 11:44:15 +0900 Subject: [PATCH 1/2] Add jpegli-static-obj build process for OBJECT library --- lib/jpegli.cmake | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/lib/jpegli.cmake b/lib/jpegli.cmake index e6993c7f..4c5610e0 100644 --- a/lib/jpegli.cmake +++ b/lib/jpegli.cmake @@ -31,18 +31,16 @@ configure_file( configure_file( ../third_party/libjpeg-turbo/jmorecfg.h include/jpegli/jmorecfg.h COPYONLY) -add_library(jpegli-static STATIC EXCLUDE_FROM_ALL "${JPEGXL_INTERNAL_JPEGLI_SOURCES}") -target_compile_options(jpegli-static PRIVATE "${JPEGXL_INTERNAL_FLAGS}") -target_compile_options(jpegli-static PUBLIC ${JPEGXL_COVERAGE_FLAGS}) -set_property(TARGET jpegli-static PROPERTY POSITION_INDEPENDENT_CODE ON) -target_include_directories(jpegli-static PRIVATE - "$" - "${JXL_HWY_INCLUDE_DIRS}" -) -target_include_directories(jpegli-static PUBLIC - "$" -) -target_link_libraries(jpegli-static PUBLIC ${JPEGLI_INTERNAL_LIBS}) +add_library(jpegli-static-obj OBJECT "${JPEGXL_INTERNAL_JPEGLI_SOURCES}") +set_property(TARGET jpegli-static-obj PROPERTY POSITION_INDEPENDENT_CODE ON) +target_compile_options(jpegli-static-obj PUBLIC "${JPEGXL_INTERNAL_FLAGS}") +target_include_directories(jpegli-static-obj + PRIVATE "$" "${JXL_HWY_INCLUDE_DIRS}" + PUBLIC "$") +target_link_libraries(jpegli-static-obj PUBLIC ${JPEGLI_INTERNAL_LIBS}) + +add_library(jpegli-static STATIC EXCLUDE_FROM_ALL $) +target_link_libraries(jpegli-static PUBLIC jpegli-static-obj) # # Tests for jpegli-static From c11862a30d09710881ea485fe197ab70565fbfeb Mon Sep 17 00:00:00 2001 From: Go Kudo Date: Thu, 6 Mar 2025 12:07:54 +0900 Subject: [PATCH 2/2] Update AUTHORS --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index a51b3b65..2297d439 100644 --- a/AUTHORS +++ b/AUTHORS @@ -57,6 +57,7 @@ Gerhard Huber Galaxy4594 <164440799+Galaxy4594@users.noreply.github.com> gi-man Gilles Devillers (GilDev) +Go Kudo Heiko Becker Ivan Kokorev Jim Robinson