zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 20:21:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Check if JPEG_XL is enabled instead of just relying on library existence alone

Browse source
This commit is contained in:
Cacodemon345 2023-08-23 02:21:16 +06:00 committed by Christoph Oelckers
parent 44a3bd719c
commit 145044ea34
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/CMakeLists.txt
View file

@ -321,7 +321,7 @@ add_custom_target( revision_check ALL
set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${CMAKE_DL_LIBS}" "${DRPC_LIBRARIES}") set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${CMAKE_DL_LIBS}" "${DRPC_LIBRARIES}")
if (TARGET PkgConfig::libjxl) if (TARGET PkgConfig::libjxl AND JPEG_XL)
list( APPEND PROJECT_LIBRARIES PkgConfig::libjxl ) list( APPEND PROJECT_LIBRARIES PkgConfig::libjxl )
endif() endif()
@ -1245,7 +1245,7 @@ set_source_files_properties( common/engine/sc_man.cpp PROPERTIES OBJECT_DEPENDS
set_source_files_properties( ${NOT_COMPILED_SOURCE_FILES} PROPERTIES HEADER_FILE_ONLY TRUE ) set_source_files_properties( ${NOT_COMPILED_SOURCE_FILES} PROPERTIES HEADER_FILE_ONLY TRUE )
set_source_files_properties( ${ZDOOM_NONPCH_SOURCES} common/textures/hires/hqresize.cpp PROPERTIES SKIP_PRECOMPILE_HEADERS TRUE ) set_source_files_properties( ${ZDOOM_NONPCH_SOURCES} common/textures/hires/hqresize.cpp PROPERTIES SKIP_PRECOMPILE_HEADERS TRUE )
if (TARGET PkgConfig::libjxl) if (TARGET PkgConfig::libjxl AND JPEG_XL)
target_compile_definitions(zdoom PRIVATE -DHAVE_JPEGXL=1) target_compile_definitions(zdoom PRIVATE -DHAVE_JPEGXL=1)
target_sources(zdoom PRIVATE common/textures/formats/jpegxltexture.cpp) target_sources(zdoom PRIVATE common/textures/formats/jpegxltexture.cpp)
else() else()