Using libjpeg and mozjpeg together?
zvezdochiot opened this issue · comments
Release: https://github.com/mozilla/mozjpeg/releases/tag/v4.0.3
diff -r mozjpeg-4.0.3/CMakeLists.txt mozjpeg-4.0.3-moz/CMakeLists.txt
12a13
> set(PRENAME moz)
574c575
< add_library(jpeg-static STATIC ${JPEG_SOURCES} $<TARGET_OBJECTS:simd>
---
> add_library(${PRENAME}jpeg-static STATIC ${JPEG_SOURCES} $<TARGET_OBJECTS:simd>
577c578
< set_target_properties(jpeg-static PROPERTIES OUTPUT_NAME jpeg)
---
> set_target_properties(${PRENAME}jpeg-static PROPERTIES OUTPUT_NAME ${PRENAME}jpeg)
592,593c593,594
< add_library(turbojpeg SHARED ${TURBOJPEG_SOURCES})
< set_property(TARGET turbojpeg PROPERTY COMPILE_FLAGS
---
> add_library(${PRENAME}turbojpeg SHARED ${TURBOJPEG_SOURCES})
> set_property(TARGET ${PRENAME}turbojpeg PROPERTY COMPILE_FLAGS
596c597
< set_target_properties(turbojpeg PROPERTIES DEFINE_SYMBOL DLLDEFINE)
---
> set_target_properties(${PRENAME}turbojpeg PROPERTIES DEFINE_SYMBOL DLLDEFINE)
599c600
< set_target_properties(turbojpeg PROPERTIES LINK_FLAGS -Wl,--kill-at)
---
> set_target_properties(${PRENAME}turbojpeg PROPERTIES LINK_FLAGS -Wl,--kill-at)
606c607
< set_target_properties(turbojpeg PROPERTIES MACOSX_RPATH 1)
---
> set_target_properties(${PRENAME}turbojpeg PROPERTIES MACOSX_RPATH 1)
608c609
< set_target_properties(turbojpeg PROPERTIES
---
> set_target_properties(${PRENAME}turbojpeg PROPERTIES
611c612
< set_target_properties(turbojpeg PROPERTIES
---
> set_target_properties(${PRENAME}turbojpeg PROPERTIES
615,616c616,617
< add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c)
< target_link_libraries(tjunittest turbojpeg)
---
> add_executable(${PRENAME}tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c)
> target_link_libraries(${PRENAME}tjunittest ${PRENAME}turbojpeg)
618c619
< target_link_libraries(tjunittest m)
---
> target_link_libraries(${PRENAME}tjunittest m)
621,622c622,623
< add_executable(tjbench tjbench.c tjutil.c)
< target_link_libraries(tjbench turbojpeg)
---
> add_executable(${PRENAME}tjbench tjbench.c tjutil.c)
> target_link_libraries(${PRENAME}tjbench ${PRENAME}turbojpeg)
624c625
< target_link_libraries(tjbench m)
---
> target_link_libraries(${PRENAME}tjbench m)
627,628c628,629
< add_executable(tjexample tjexample.c)
< target_link_libraries(tjexample turbojpeg)
---
> add_executable(${PRENAME}tjexample tjexample.c)
> target_link_libraries(${PRENAME}tjexample ${PRENAME}turbojpeg)
630c631
< target_link_libraries(tjexample m)
---
> target_link_libraries(${PRENAME}tjexample m)
635c636
< add_library(turbojpeg-static STATIC ${JPEG_SOURCES} $<TARGET_OBJECTS:simd>
---
> add_library(${PRENAME}turbojpeg-static STATIC ${JPEG_SOURCES} $<TARGET_OBJECTS:simd>
638c639
< set_property(TARGET turbojpeg-static PROPERTY COMPILE_FLAGS
---
> set_property(TARGET ${PRENAME}turbojpeg-static PROPERTY COMPILE_FLAGS
641c642
< set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg)
---
> set_target_properties(${PRENAME}turbojpeg-static PROPERTIES OUTPUT_NAME ${PRENAME}turbojpeg)
644c645
< add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c
---
> add_executable(${PRENAME}tjunittest-static tjunittest.c tjutil.c md5/md5.c
646c647
< target_link_libraries(tjunittest-static turbojpeg-static)
---
> target_link_libraries(${PRENAME}tjunittest-static ${PRENAME}turbojpeg-static)
648c649
< target_link_libraries(tjunittest-static m)
---
> target_link_libraries(${PRENAME}tjunittest-static m)
651,652c652,653
< add_executable(tjbench-static tjbench.c tjutil.c)
< target_link_libraries(tjbench-static turbojpeg-static)
---
> add_executable(${PRENAME}tjbench-static tjbench.c tjutil.c)
> target_link_libraries(${PRENAME}tjbench-static ${PRENAME}turbojpeg-static)
654c655
< target_link_libraries(tjbench-static m)
---
> target_link_libraries(${PRENAME}tjbench-static m)
677c678
< add_executable(cjpeg-static cjpeg.c cdjpeg.c rdgif.c rdppm.c rdjpeg.c rdswitch.c
---
> add_executable(${PRENAME}cjpeg-static cjpeg.c cdjpeg.c rdgif.c rdppm.c rdjpeg.c rdswitch.c
679,680c680,681
< set_property(TARGET cjpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
< target_link_libraries(cjpeg-static jpeg-static)
---
> set_property(TARGET ${PRENAME}cjpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
> target_link_libraries(${PRENAME}cjpeg-static ${PRENAME}jpeg-static)
682c683
< target_link_libraries(cjpeg-static m)
---
> target_link_libraries(${PRENAME}cjpeg-static m)
698c699
< find_package(PNG 1.6 REQUIRED)
---
> find_package(PNG 1.2 REQUIRED)
702,703c703,704
< target_include_directories(cjpeg-static PUBLIC ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
< target_link_libraries(cjpeg-static ${PNG_LIBRARY} ${ZLIB_LIBRARY})
---
> target_include_directories(${PRENAME}cjpeg-static PUBLIC ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
> target_link_libraries(${PRENAME}cjpeg-static ${PNG_LIBRARY} ${ZLIB_LIBRARY})
706c707
< add_executable(djpeg-static djpeg.c cdjpeg.c rdcolmap.c rdswitch.c wrgif.c
---
> add_executable(${PRENAME}djpeg-static djpeg.c cdjpeg.c rdcolmap.c rdswitch.c wrgif.c
708,709c709,710
< set_property(TARGET djpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
< target_link_libraries(djpeg-static jpeg-static)
---
> set_property(TARGET ${PRENAME}djpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
> target_link_libraries(${PRENAME}djpeg-static ${PRENAME}jpeg-static)
711c712
< target_link_libraries(djpeg-static m)
---
> target_link_libraries(${PRENAME}djpeg-static m)
714,715c715,716
< add_executable(jpegtran-static jpegtran.c cdjpeg.c rdswitch.c transupp.c)
< target_link_libraries(jpegtran-static jpeg-static)
---
> add_executable(${PRENAME}jpegtran-static jpegtran.c cdjpeg.c rdswitch.c transupp.c)
> target_link_libraries(${PRENAME}jpegtran-static ${PRENAME}jpeg-static)
717c718
< target_link_libraries(jpegtran-static m)
---
> target_link_libraries(${PRENAME}jpegtran-static m)
720c721
< set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
---
> set_property(TARGET ${PRENAME}jpegtran-static PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
723c724
< add_executable(rdjpgcom rdjpgcom.c)
---
> add_executable(${PRENAME}rdjpgcom rdjpgcom.c)
725c726
< add_executable(wrjpgcom wrjpgcom.c)
---
> add_executable(${PRENAME}wrjpgcom wrjpgcom.c)
1428c1429
< install(TARGETS turbojpeg tjbench
---
> install(TARGETS ${PRENAME}turbojpeg ${PRENAME}tjbench
1439c1440
< install(TARGETS turbojpeg-static ARCHIVE
---
> install(TARGETS ${PRENAME}turbojpeg-static ARCHIVE
1456c1457
< install(TARGETS jpeg-static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
---
> install(TARGETS ${PRENAME}jpeg-static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
1463c1464
< install(PROGRAMS ${DIR}/cjpeg-static${EXE}
---
> install(PROGRAMS ${DIR}/${PRENAME}cjpeg-static${EXE}
1465c1466
< install(PROGRAMS ${DIR}/djpeg-static${EXE}
---
> install(PROGRAMS ${DIR}/${PRENAME}djpeg-static${EXE}
1467c1468
< install(PROGRAMS ${DIR}/jpegtran-static${EXE}
---
> install(PROGRAMS ${DIR}/${PRENAME}jpegtran-static${EXE}
1472c1473
< install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
---
> install(TARGETS ${PRENAME}rdjpgcom ${PRENAME}wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff -r mozjpeg-4.0.3/sharedlib/CMakeLists.txt mozjpeg-4.0.3-moz/sharedlib/CMakeLists.txt
10a11
> set(PRENAME moz)
38c39
< add_library(jpeg SHARED ${JPEG_SRCS} ${DEFFILE} $<TARGET_OBJECTS:simd>
---
> add_library(${PRENAME}jpeg SHARED ${JPEG_SRCS} ${DEFFILE} $<TARGET_OBJECTS:simd>
41c42
< target_link_libraries(jpeg m)
---
> target_link_libraries(${PRENAME}jpeg m)
44c45
< set_target_properties(jpeg PROPERTIES SOVERSION ${SO_MAJOR_VERSION}
---
> set_target_properties(${PRENAME}jpeg PROPERTIES SOVERSION ${SO_MAJOR_VERSION}
51c52
< set_target_properties(jpeg PROPERTIES MACOSX_RPATH 1)
---
> set_target_properties(${PRENAME}jpeg PROPERTIES MACOSX_RPATH 1)
54c55
< set_target_properties(jpeg PROPERTIES
---
> set_target_properties(${PRENAME}jpeg PROPERTIES
58,59c59,60
< set_target_properties(jpeg PROPERTIES
< RUNTIME_OUTPUT_NAME jpeg${SO_MAJOR_VERSION})
---
> set_target_properties(${PRENAME}jpeg PROPERTIES
> RUNTIME_OUTPUT_NAME ${PRENAME}jpeg${SO_MAJOR_VERSION})
61c62
< set_target_properties(jpeg PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT /NODEFAULTLIB:LIBCMTD")
---
> set_target_properties(${PRENAME}jpeg PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT /NODEFAULTLIB:LIBCMTD")
63c64
< set_target_properties(jpeg PROPERTIES SUFFIX -${SO_MAJOR_VERSION}.dll)
---
> set_target_properties(${PRENAME}jpeg PROPERTIES SUFFIX -${SO_MAJOR_VERSION}.dll)
83c84
< add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdgif.c ../rdppm.c ../rdjpeg.c
---
> add_executable(${PRENAME}cjpeg ../cjpeg.c ../cdjpeg.c ../rdgif.c ../rdppm.c ../rdjpeg.c
85,86c86,87
< set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
< target_link_libraries(cjpeg jpeg)
---
> set_property(TARGET ${PRENAME}cjpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
> target_link_libraries(${PRENAME}cjpeg ${PRENAME}jpeg)
97c98
< find_package(PNG 1.6 REQUIRED)
---
> find_package(PNG 1.2 REQUIRED)
99,100c100,101
< target_include_directories(cjpeg PUBLIC ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
< target_link_libraries(cjpeg ${PNG_LIBRARY} ${ZLIB_LIBRARY})
---
> target_include_directories(${PRENAME}cjpeg PUBLIC ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
> target_link_libraries(${PRENAME}cjpeg ${PNG_LIBRARY} ${ZLIB_LIBRARY})
103c104
< add_executable(djpeg ../djpeg.c ../cdjpeg.c ../rdcolmap.c ../rdswitch.c
---
> add_executable(${PRENAME}djpeg ../djpeg.c ../cdjpeg.c ../rdcolmap.c ../rdswitch.c
105,106c106,107
< set_property(TARGET djpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
< target_link_libraries(djpeg jpeg)
---
> set_property(TARGET ${PRENAME}djpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
> target_link_libraries(${PRENAME}djpeg ${PRENAME}jpeg)
108,110c109,111
< add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c)
< target_link_libraries(jpegtran jpeg)
< set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
---
> add_executable(${PRENAME}jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c)
> target_link_libraries(${PRENAME}jpegtran ${PRENAME}jpeg)
> set_property(TARGET ${PRENAME}jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
112,113c113,114
< add_executable(jcstest ../jcstest.c)
< target_link_libraries(jcstest jpeg)
---
> add_executable(${PRENAME}jcstest ../jcstest.c)
> target_link_libraries(${PRENAME}jcstest ${PRENAME}jpeg)
115c116
< install(TARGETS jpeg cjpeg djpeg jpegtran
---
> install(TARGETS ${PRENAME}jpeg ${PRENAME}cjpeg ${PRENAME}djpeg ${PRENAME}jpegtranOverdue.