Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ Gerhard Huber <support@pl32.com>
Galaxy4594 <164440799+Galaxy4594@users.noreply.github.com>
gi-man
Gilles Devillers (GilDev) <gildev@gmail.com>
Go Kudo <g-kudo@colopl.co.jp>
Heiko Becker <heirecka@exherbo.org>
Ivan Kokorev
Jim Robinson <jimbo2150@gmail.com>
Expand Down
22 changes: 10 additions & 12 deletions lib/jpegli.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>"
"${JXL_HWY_INCLUDE_DIRS}"
)
target_include_directories(jpegli-static PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include/jpegli>"
)
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 "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>" "${JXL_HWY_INCLUDE_DIRS}"
PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include/jpegli>")
target_link_libraries(jpegli-static-obj PUBLIC ${JPEGLI_INTERNAL_LIBS})

add_library(jpegli-static STATIC EXCLUDE_FROM_ALL $<TARGET_OBJECTS:jpegli-static-obj>)
target_link_libraries(jpegli-static PUBLIC jpegli-static-obj)

#
# Tests for jpegli-static
Expand Down