ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build/Win: Fix CMake warning when WITH_TURBOJPEG=0

Browse Source 
When 12-bit-per-component JPEG support is enabled (WITH_12BIT=1) or the
TurboJPEG API library and associated test programs are disabled
(WITH_TURBOJPEG=0), the Windows installer target should not depend on
the turbojpeg, turbojpeg-static, and tjbench targets.
This commit is contained in:
DRC
2022-03-11 11:49:34 -06:00
parent a014845403
commit 30cba2a2f8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmakescripts/BuildPackages.cmake
View File

@@ -109,10 +109,13 @@ configure_file(win/${INST_ID}/projectTargets-release.cmake.in
if(WITH_JAVA) if(WITH_JAVA)
set(JAVA_DEPEND turbojpeg-java) set(JAVA_DEPEND turbojpeg-java)
endif() endif()
if(WITH_TURBOJPEG)
set(TURBOJPEG_DEPEND turbojpeg turbojpeg-static tjbench)
endif()
add_custom_target(installer add_custom_target(installer
makensis -nocd ${INST_DEFS} installer.nsi makensis -nocd ${INST_DEFS} installer.nsi
DEPENDS jpeg jpeg-static turbojpeg turbojpeg-static rdjpgcom wrjpgcom DEPENDS jpeg jpeg-static rdjpgcom wrjpgcom cjpeg djpeg jpegtran
cjpeg djpeg jpegtran tjbench ${JAVA_DEPEND} ${JAVA_DEPEND} ${TURBOJPEG_DEPEND}
SOURCES installer.nsi) SOURCES installer.nsi)
endif() # WIN32 endif() # WIN32