From cc154bf2df32a1773a1d01e761de858b3e5de34a Mon Sep 17 00:00:00 2001 From: Ede Bittner Date: Tue, 25 Feb 2025 14:36:48 +0100 Subject: [PATCH] Build only lib on Windows #27 - enable WIN32 jpeg dll build - exporting all symbols from the jpeg.dll (because no export were defined) --- CONTRIBUTORS | 1 + lib/jpegli.cmake | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 848096f92..4c3a1b83e 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -21,3 +21,4 @@ Sami Boukortt Sebastian Gomez-Gonzalez Thomas Fischbacher Zoltan Szabadka +Ede Bittner diff --git a/lib/jpegli.cmake b/lib/jpegli.cmake index e6993c7fc..24436dadd 100644 --- a/lib/jpegli.cmake +++ b/lib/jpegli.cmake @@ -106,7 +106,7 @@ endif() # Build libjpeg.so that links to libjpeg-static # -if (JPEGXL_ENABLE_JPEGLI_LIBJPEG AND NOT APPLE AND NOT WIN32 AND NOT EMSCRIPTEN) +if (JPEGXL_ENABLE_JPEGLI_LIBJPEG AND NOT APPLE AND NOT EMSCRIPTEN) add_library(jpegli-libjpeg-obj OBJECT "${JPEGXL_INTERNAL_JPEGLI_WRAPPER_SOURCES}") target_compile_options(jpegli-libjpeg-obj PRIVATE ${JPEGXL_INTERNAL_FLAGS}) target_compile_options(jpegli-libjpeg-obj PUBLIC ${JPEGXL_COVERAGE_FLAGS}) @@ -133,7 +133,8 @@ set_target_properties(jpeg PROPERTIES # Add a jpeg.version file as a version script to tag symbols with the # appropriate version number. set_target_properties(jpeg PROPERTIES - LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/jpegli/jpeg.version.${JPEGLI_LIBJPEG_LIBRARY_SOVERSION}) + LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/jpegli/jpeg.version.${JPEGLI_LIBJPEG_LIBRARY_SOVERSION} + WINDOWS_EXPORT_ALL_SYMBOLS ON) set_property(TARGET jpeg APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/jpegli/jpeg.version.${JPEGLI_LIBJPEG_LIBRARY_SOVERSION}")