Skip to content

Commit b156233

Browse files
author
Jehan
committed
Make mozjpeg side-by-side installable with jpeg-turbo.
By default, mozjpeg will stay named generically libjpeg on Windows, whereas it will install with its own namespace on other OSes, i.e. libmozjpeg.so|a, mozjpeg.pc, etc. The public header files keep their name but are installed under include/mozjpeg/ (the pkg-config file will take care of providing proper build flags), this way no include gets broken. The new option WITH_MOZPREFIX allows to bypass the default behavior (so that it is still possible to name the lib mozjpeg name on Windows, or libjpeg on other OSes). A second new option WITH_LIBJPEG_PKG_CONFIG add a libjpeg.pc even when WITH_MOZPREFIX is ON (additionally to mozjpeg.pc). Pkg-config is the modern way for software to find their dependencies and correct build/link flags.
1 parent 61e03cc commit b156233

3 files changed

Lines changed: 115 additions & 60 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 87 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,41 @@ option(WITH_MEM_SRCDST "Include in-memory source/destination manager functions w
246246
boolean_number(WITH_MEM_SRCDST)
247247
option(WITH_SIMD "Include SIMD extensions, if available for this platform" TRUE)
248248
boolean_number(WITH_SIMD)
249-
option(WITH_TURBOJPEG "Include the TurboJPEG API library and associated test programs" TRUE)
249+
option(WITH_TURBOJPEG "Include the TurboJPEG API library and associated test programs" FALSE)
250250
boolean_number(WITH_TURBOJPEG)
251251
option(WITH_FUZZ "Build fuzz targets" FALSE)
252252

253+
# MozJPEG build differences from upstream jpeg-turbo:
254+
# 1. WITH_TURBOJPEG is OFF by default.
255+
# 2. WITH_MOZPREFIX set to ON does the following:
256+
# * it adds a "moz" prefix to the libraries (libmozjpeg.so*, .a, .dll, etc.),
257+
# the utilities (mozcpjeg, mozjpegtran, etc.) and the man pages.
258+
# * It renames the pkg-config file mozjpeg.pc.
259+
# * It installs header files inside ${includedir}/mozjpeg/ which is properly
260+
# advertized in the pkg-config file.
261+
# This makes upstream jpeg-turbo and mozjpeg side-by-side installable and
262+
# gives the ability to know when you are building against mozjpeg in
263+
# particular.
264+
# 3. WITH_LIBJPEG_PKG_CONFIG will install both mozjpeg.pc and libjpeg.pc
265+
# (libraries are still prefixed yet these can be discovered when searching a
266+
# generic libjpeg with pkg-config).
267+
# 4. If WITH_MOZPREFIX is OFF, everything will be named generically without
268+
# prefix and headers installed in ${includedir}/.
269+
# WITH_LIBJPEG_PKG_CONFIG is ignored in this case.
270+
# WITH_MOZPREFIX is OFF by default on Windows and ON by default on other
271+
# OSes.
272+
273+
if(WIN32)
274+
option(WITH_MOZPREFIX "Rename the library mozjpeg" FALSE)
275+
else()
276+
option(WITH_MOZPREFIX "Rename the library mozjpeg" TRUE)
277+
endif()
278+
option(WITH_LIBJPEG_PKG_CONFIG "Install libjpeg.pc additionally to mozjpeg.pc (ignored when WITH_MOZPREFIX=OFF)" FALSE)
279+
280+
if(WITH_MOZPREFIX)
281+
set(MOZPREFIX "moz")
282+
endif()
283+
253284
macro(report_option var desc)
254285
if(${var})
255286
message(STATUS "${desc} enabled (${var} = ${${var}})")
@@ -645,10 +676,10 @@ if(ENABLE_SHARED)
645676
endif()
646677

647678
if(ENABLE_STATIC)
648-
add_library(jpeg-static STATIC ${JPEG_SOURCES} $<TARGET_OBJECTS:simd>
679+
add_library(${MOZPREFIX}jpeg-static STATIC ${JPEG_SOURCES} $<TARGET_OBJECTS:simd>
649680
${SIMD_OBJS})
650681
if(NOT MSVC)
651-
set_target_properties(jpeg-static PROPERTIES OUTPUT_NAME jpeg)
682+
set_target_properties(${MOZPREFIX}jpeg-static PROPERTIES OUTPUT_NAME ${MOZPREFIX}jpeg)
652683
endif()
653684
endif()
654685

@@ -754,12 +785,12 @@ else()
754785
endif()
755786

756787
if(ENABLE_STATIC)
757-
add_executable(cjpeg-static cjpeg.c cdjpeg.c rdgif.c rdppm.c rdjpeg.c rdswitch.c
788+
add_executable(${MOZPREFIX}cjpeg-static cjpeg.c cdjpeg.c rdgif.c rdppm.c rdjpeg.c rdswitch.c
758789
${CJPEG_BMP_SOURCES})
759-
set_property(TARGET cjpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
760-
target_link_libraries(cjpeg-static jpeg-static)
790+
set_property(TARGET ${MOZPREFIX}cjpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
791+
target_link_libraries(${MOZPREFIX}cjpeg-static ${MOZPREFIX}jpeg-static)
761792
if(UNIX)
762-
target_link_libraries(cjpeg-static m)
793+
target_link_libraries(${MOZPREFIX}cjpeg-static m)
763794
endif()
764795

765796
if(PNG_SUPPORTED)
@@ -779,30 +810,30 @@ if(ENABLE_STATIC)
779810
if (NOT APPLE)
780811
find_package(ZLIB REQUIRED)
781812
endif()
782-
target_include_directories(cjpeg-static PUBLIC ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
783-
target_link_libraries(cjpeg-static ${PNG_LIBRARY} ${ZLIB_LIBRARY})
813+
target_include_directories(${MOZPREFIX}cjpeg-static PUBLIC ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
814+
target_link_libraries(${MOZPREFIX}cjpeg-static ${PNG_LIBRARY} ${ZLIB_LIBRARY})
784815
endif()
785816

786-
add_executable(djpeg-static djpeg.c cdjpeg.c rdcolmap.c rdswitch.c wrgif.c
817+
add_executable(${MOZPREFIX}djpeg-static djpeg.c cdjpeg.c rdcolmap.c rdswitch.c wrgif.c
787818
wrppm.c ${DJPEG_BMP_SOURCES})
788-
set_property(TARGET djpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
789-
target_link_libraries(djpeg-static jpeg-static)
819+
set_property(TARGET ${MOZPREFIX}djpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
820+
target_link_libraries(${MOZPREFIX}djpeg-static ${MOZPREFIX}jpeg-static)
790821
if(UNIX)
791-
target_link_libraries(djpeg-static m)
822+
target_link_libraries(${MOZPREFIX}djpeg-static m)
792823
endif()
793824

794-
add_executable(jpegtran-static jpegtran.c cdjpeg.c rdswitch.c transupp.c)
795-
target_link_libraries(jpegtran-static jpeg-static)
825+
add_executable(${MOZPREFIX}jpegtran-static jpegtran.c cdjpeg.c rdswitch.c transupp.c)
826+
target_link_libraries(${MOZPREFIX}jpegtran-static ${MOZPREFIX}jpeg-static)
796827
if(UNIX)
797-
target_link_libraries(jpegtran-static m)
828+
target_link_libraries(${MOZPREFIX}jpegtran-static m)
798829
endif()
799830

800-
set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
831+
set_property(TARGET ${MOZPREFIX}jpegtran-static PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
801832
endif()
802833

803-
add_executable(rdjpgcom rdjpgcom.c)
834+
add_executable(${MOZPREFIX}rdjpgcom rdjpgcom.c)
804835

805-
add_executable(wrjpgcom wrjpgcom.c)
836+
add_executable(${MOZPREFIX}wrjpgcom wrjpgcom.c)
806837

807838

808839
###############################################################################
@@ -1112,7 +1143,7 @@ foreach(libtype ${TEST_LIBTYPES})
11121143

11131144
macro(add_bittest PROG NAME ARGS OUTFILE INFILE MD5SUM)
11141145
add_test(${PROG}-${libtype}-${NAME}
1115-
${CMAKE_CROSSCOMPILING_EMULATOR} ${PROG}${suffix} ${ARGS}
1146+
${CMAKE_CROSSCOMPILING_EMULATOR} ${MOZPREFIX}${PROG}${suffix} ${ARGS}
11161147
-outfile ${OUTFILE} ${INFILE})
11171148
add_test(${PROG}-${libtype}-${NAME}-cmp
11181149
${CMAKE_CROSSCOMPILING_EMULATOR} ${MD5CMP} ${MD5SUM} ${OUTFILE})
@@ -1366,7 +1397,7 @@ foreach(libtype ${TEST_LIBTYPES})
13661397

13671398
# Context rows: Yes Intra-iMCU row: No iMCU row prefetch: No ENT: prog huff
13681399
add_test(cjpeg-${libtype}-420-islow-prog
1369-
${CMAKE_CROSSCOMPILING_EMULATOR} cjpeg${suffix} -dct int -prog
1400+
${CMAKE_CROSSCOMPILING_EMULATOR} ${MOZPREFIX}cjpeg${suffix} -dct int -prog
13701401
-outfile testout_420_islow_prog.jpg ${TESTIMAGES}/testorig.ppm)
13711402
add_bittest(djpeg 420-islow-prog-crop62x62_71_71
13721403
"-dct;int;-crop;62x62+71+71;-ppm"
@@ -1383,15 +1414,15 @@ foreach(libtype ${TEST_LIBTYPES})
13831414

13841415
# Context rows: No Intra-iMCU row: Yes ENT: huff
13851416
add_test(cjpeg-${libtype}-444-islow
1386-
${CMAKE_CROSSCOMPILING_EMULATOR} cjpeg${suffix} -dct int -sample 1x1
1417+
${CMAKE_CROSSCOMPILING_EMULATOR} ${MOZPREFIX}cjpeg${suffix} -dct int -sample 1x1
13871418
-outfile testout_444_islow.jpg ${TESTIMAGES}/testorig.ppm)
13881419
add_bittest(djpeg 444-islow-skip1_6 "-dct;int;-skip;1,6;-ppm"
13891420
testout_444_islow_skip1,6.ppm testout_444_islow.jpg
13901421
${MD5_PPM_444_ISLOW_SKIP1_6} cjpeg-${libtype}-444-islow)
13911422

13921423
# Context rows: No Intra-iMCU row: No ENT: prog huff
13931424
add_test(cjpeg-${libtype}-444-islow-prog
1394-
${CMAKE_CROSSCOMPILING_EMULATOR} cjpeg${suffix} -dct int -prog -sample 1x1
1425+
${CMAKE_CROSSCOMPILING_EMULATOR} ${MOZPREFIX}cjpeg${suffix} -dct int -prog -sample 1x1
13951426
-outfile testout_444_islow_prog.jpg ${TESTIMAGES}/testorig.ppm)
13961427
add_bittest(djpeg 444-islow-prog-crop98x98_13_13
13971428
"-dct;int;-crop;98x98+13+13;-ppm"
@@ -1527,7 +1558,7 @@ if(WITH_TURBOJPEG)
15271558
endif()
15281559

15291560
if(ENABLE_STATIC)
1530-
install(TARGETS jpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets
1561+
install(TARGETS ${MOZPREFIX}jpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets
15311562
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
15321563
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
15331564
if(NOT ENABLE_SHARED)
@@ -1545,7 +1576,7 @@ if(ENABLE_STATIC)
15451576
endif()
15461577
endif()
15471578

1548-
install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
1579+
install(TARGETS ${MOZPREFIX}rdjpgcom ${MOZPREFIX}wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
15491580

15501581
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg
15511582
${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt
@@ -1561,13 +1592,34 @@ endif()
15611592

15621593
if(UNIX OR MINGW)
15631594
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1
1564-
${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1
1565-
${CMAKE_CURRENT_SOURCE_DIR}/rdjpgcom.1
1566-
${CMAKE_CURRENT_SOURCE_DIR}/wrjpgcom.1
1567-
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
1595+
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
1596+
RENAME ${MOZPREFIX}cjpeg.1)
1597+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1
1598+
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
1599+
RENAME ${MOZPREFIX}djpeg.1)
1600+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1
1601+
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
1602+
RENAME ${MOZPREFIX}jpegtran.1)
1603+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/rdjpgcom.1
1604+
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
1605+
RENAME ${MOZPREFIX}rdjpgcom.1)
1606+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wrjpgcom.1
1607+
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
1608+
RENAME ${MOZPREFIX}wrjpgcom.1)
1609+
endif()
1610+
1611+
if(WITH_MOZPREFIX)
1612+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libjpeg.pc
1613+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
1614+
RENAME mozjpeg.pc)
1615+
if(WITH_LIBJPEG_PKG_CONFIG)
1616+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libjpeg.pc
1617+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
1618+
endif()
1619+
else()
1620+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libjpeg.pc
1621+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
15681622
endif()
1569-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libjpeg.pc
1570-
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
15711623
if(WITH_TURBOJPEG)
15721624
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libturbojpeg.pc
15731625
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
@@ -1580,10 +1632,13 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets
15801632
NAMESPACE ${CMAKE_PROJECT_NAME}::
15811633
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME})
15821634

1635+
if(WITH_MOZPREFIX)
1636+
set(MOZJPEG_INCLUDE_SUBDIR "${MOZPREFIX}jpeg")
1637+
endif()
15831638
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h
15841639
${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h
15851640
${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h
1586-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
1641+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${MOZJPEG_INCLUDE_SUBDIR})
15871642

15881643
include(cmakescripts/BuildPackages.cmake)
15891644

‎release/libjpeg.pc.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ exec_prefix=@CMAKE_INSTALL_PREFIX@
33
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
44
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
55

6-
Name: libjpeg
7-
Description: A SIMD-accelerated JPEG codec that provides the libjpeg API
6+
Name: lib@MOZPREFIX@jpeg
7+
Description: MozJPEG's improvements of libjpeg-turbo providing the libjpeg API
88
Version: @VERSION@
9-
Libs: -L${libdir} -ljpeg
10-
Cflags: -I${includedir}
9+
Libs: -L${libdir} -l@MOZPREFIX@jpeg
10+
Cflags: -I${includedir}/@MOZJPEG_INCLUDE_SUBDIR@

‎sharedlib/CMakeLists.txt‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -40,32 +40,32 @@ if(MSVC)
4040
${CMAKE_BINARY_DIR}/win/jpeg.rc)
4141
set(JPEG_SRCS ${JPEG_SRCS} ${CMAKE_BINARY_DIR}/win/jpeg.rc)
4242
endif()
43-
add_library(jpeg SHARED ${JPEG_SRCS} ${DEFFILE} $<TARGET_OBJECTS:simd>
43+
add_library(${MOZPREFIX}jpeg SHARED ${JPEG_SRCS} ${DEFFILE} $<TARGET_OBJECTS:simd>
4444
${SIMD_OBJS})
4545
if(UNIX)
46-
target_link_libraries(jpeg m)
46+
target_link_libraries(${MOZPREFIX}jpeg m)
4747
endif()
4848

49-
set_target_properties(jpeg PROPERTIES SOVERSION ${SO_MAJOR_VERSION}
49+
set_target_properties(${MOZPREFIX}jpeg PROPERTIES SOVERSION ${SO_MAJOR_VERSION}
5050
VERSION ${SO_MAJOR_VERSION}.${SO_AGE}.${SO_MINOR_VERSION})
5151
if(APPLE AND (NOT CMAKE_OSX_DEPLOYMENT_TARGET OR
5252
CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER 10.4))
5353
if(NOT CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG)
5454
set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
5555
endif()
56-
set_target_properties(jpeg PROPERTIES MACOSX_RPATH 1)
56+
set_target_properties(${MOZPREFIX}jpeg PROPERTIES MACOSX_RPATH 1)
5757
endif()
5858
if(MAPFLAG)
59-
set_target_properties(jpeg PROPERTIES
59+
set_target_properties(${MOZPREFIX}jpeg PROPERTIES
6060
LINK_FLAGS "${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/../libjpeg.map")
6161
endif()
6262
if(MSVC)
63-
set_target_properties(jpeg PROPERTIES
64-
RUNTIME_OUTPUT_NAME jpeg${SO_MAJOR_VERSION})
63+
set_target_properties(${MOZPREFIX}jpeg PROPERTIES
64+
RUNTIME_OUTPUT_NAME ${MOZPREFIX}jpeg${SO_MAJOR_VERSION})
6565
# The jsimd_*.c file is built using /MT, so this prevents a linker warning.
66-
set_target_properties(jpeg PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT /NODEFAULTLIB:LIBCMTD")
66+
set_target_properties(${MOZPREFIX}jpeg PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT /NODEFAULTLIB:LIBCMTD")
6767
elseif(MINGW)
68-
set_target_properties(jpeg PROPERTIES SUFFIX -${SO_MAJOR_VERSION}.dll)
68+
set_target_properties(${MOZPREFIX}jpeg PROPERTIES SUFFIX -${SO_MAJOR_VERSION}.dll)
6969
endif()
7070

7171
if(WIN32)
@@ -85,10 +85,10 @@ else()
8585
endif()
8686
endif()
8787

88-
add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdgif.c ../rdppm.c ../rdjpeg.c
88+
add_executable(${MOZPREFIX}cjpeg ../cjpeg.c ../cdjpeg.c ../rdgif.c ../rdppm.c ../rdjpeg.c
8989
../rdswitch.c ${CJPEG_BMP_SOURCES})
90-
set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
91-
target_link_libraries(cjpeg jpeg)
90+
set_property(TARGET ${MOZPREFIX}cjpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
91+
target_link_libraries(${MOZPREFIX}cjpeg ${MOZPREFIX}jpeg)
9292

9393
if(PNG_SUPPORTED)
9494
# to avoid finding static library from CMake cache
@@ -101,31 +101,31 @@ if(PNG_SUPPORTED)
101101

102102
find_package(PNG 1.6 REQUIRED)
103103
find_package(ZLIB REQUIRED)
104-
target_include_directories(cjpeg PUBLIC ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
105-
target_link_libraries(cjpeg ${PNG_LIBRARY} ${ZLIB_LIBRARY})
104+
target_include_directories(${MOZPREFIX}cjpeg PUBLIC ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
105+
target_link_libraries(${MOZPREFIX}cjpeg ${PNG_LIBRARY} ${ZLIB_LIBRARY})
106106
endif()
107107

108-
add_executable(djpeg ../djpeg.c ../cdjpeg.c ../rdcolmap.c ../rdswitch.c
108+
add_executable(${MOZPREFIX}djpeg ../djpeg.c ../cdjpeg.c ../rdcolmap.c ../rdswitch.c
109109
../wrgif.c ../wrppm.c ${DJPEG_BMP_SOURCES})
110-
set_property(TARGET djpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
111-
target_link_libraries(djpeg jpeg)
110+
set_property(TARGET ${MOZPREFIX}djpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
111+
target_link_libraries(${MOZPREFIX}djpeg ${MOZPREFIX}jpeg)
112112

113-
add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c)
114-
target_link_libraries(jpegtran jpeg)
115-
set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
113+
add_executable(${MOZPREFIX}jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c)
114+
target_link_libraries(${MOZPREFIX}jpegtran ${MOZPREFIX}jpeg)
115+
set_property(TARGET ${MOZPREFIX}jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
116116

117117
add_executable(jcstest ../jcstest.c)
118-
target_link_libraries(jcstest jpeg)
118+
target_link_libraries(jcstest ${MOZPREFIX}jpeg)
119119

120-
install(TARGETS jpeg EXPORT ${CMAKE_PROJECT_NAME}Targets
120+
install(TARGETS ${MOZPREFIX}jpeg EXPORT ${CMAKE_PROJECT_NAME}Targets
121121
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
122122
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
123123
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
124124
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
125-
install(TARGETS cjpeg djpeg jpegtran
125+
install(TARGETS ${MOZPREFIX}cjpeg ${MOZPREFIX}djpeg ${MOZPREFIX}jpegtran
126126
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
127127
if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND
128128
CMAKE_C_LINKER_SUPPORTS_PDB)
129-
install(FILES "$<TARGET_PDB_FILE:jpeg>"
129+
install(FILES "$<TARGET_PDB_FILE:${MOZPREFIX}jpeg>"
130130
DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
131131
endif()

0 commit comments

Comments
 (0)