liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add libjxl version to AboutThisBuild.txt

Browse Source
This commit is contained in:
xiota 2024-05-26 11:23:41 +00:00
parent a5954ad4c2
commit 40f9eefabe
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AboutThisBuild.txt.in
View File

@ -8,6 +8,7 @@ System: ${SYSTEM}
Bit depth: ${PROC_BIT_DEPTH} Bit depth: ${PROC_BIT_DEPTH}
Gtkmm: V${GTKMM_VERSION} Gtkmm: V${GTKMM_VERSION}
Lensfun: V${LENSFUN_VERSION} Lensfun: V${LENSFUN_VERSION}
libjxl: V${JXL_VERSION}
Build type: ${BUILD_TYPE} Build type: ${BUILD_TYPE}
Build flags: ${CXX_FLAGS} Build flags: ${CXX_FLAGS}
Link flags: ${LFLAGS} Link flags: ${LFLAGS}

9
CMakeLists.txt
View File

@ -560,14 +560,19 @@ if(WITH_JXL AND NOT WITH_JXL STREQUAL "AUTO")
else() else()
set(JXL_REQUIRED "") set(JXL_REQUIRED "")
endif() endif()
pkg_check_modules(JXL ${JXL_REQUIRED} IMPORTED_TARGET libjxl libjxl_threads) pkg_check_modules(JXL ${JXL_REQUIRED} IMPORTED_TARGET libjxl)
pkg_check_modules(JXLTHREADS ${JXL_REQUIRED} IMPORTED_TARGET libjxl_threads)
if(JXL_FOUND) if(JXL_FOUND)
if(WITH_JXL OR WITH_JXL STREQUAL "AUTO") if(WITH_JXL OR WITH_JXL STREQUAL "AUTO")
add_definitions(-DLIBJXL) add_definitions(-DLIBJXL)
list(APPEND JXL_INCLUDE_DIRS ${JXLTHREADS_INCLUDE_DIRS})
list(APPEND JXL_LIBRARIES ${JXLTHREADS_LIBRARIES})
else() else()
message(STATUS " JXL support disabled by WITH_JXL = ${WITH_JXL}") message(STATUS " JXL support disabled by WITH_JXL = ${WITH_JXL}")
set(JXL_INCLUDE_DIRS "") set(JXL_INCLUDE_DIRS "")
set(JXL_LIBRARIES "") set(JXL_LIBRARIES "")
set(JXLTHREADS_INCLUDE_DIRS "")
set(JXLTHREADS_LIBRARIES "")
endif() endif()
endif() endif()
@ -751,6 +756,7 @@ if(NOT APPLE)
-DGTKMM_VERSION:STRING=${GTKMM_VERSION} -DGTKMM_VERSION:STRING=${GTKMM_VERSION}
-DOPTION_OMP:STRING=${OPTION_OMP} -DOPTION_OMP:STRING=${OPTION_OMP}
-DWITH_MYFILE_MMAP:STRING=${WITH_MYFILE_MMAP} -DWITH_MYFILE_MMAP:STRING=${WITH_MYFILE_MMAP}
-DJXL_VERSION:STRING=${JXL_VERSION}
-DLENSFUN_VERSION:STRING=${LENSFUN_VERSION}) -DLENSFUN_VERSION:STRING=${LENSFUN_VERSION})
endif() endif()
@ -780,6 +786,7 @@ elseif(APPLE)
-DGTKMM_VERSION:STRING=${GTKMM_VERSION} -DGTKMM_VERSION:STRING=${GTKMM_VERSION}
-DOPTION_OMP:STRING=${OPTION_OMP} -DOPTION_OMP:STRING=${OPTION_OMP}
-DWITH_MYFILE_MMAP:STRING=${WITH_MYFILE_MMAP} -DWITH_MYFILE_MMAP:STRING=${WITH_MYFILE_MMAP}
-DJXL_VERSION:STRING=${JXL_VERSION}
-DLENSFUN_VERSION:STRING=${LENSFUN_VERSION} -DLENSFUN_VERSION:STRING=${LENSFUN_VERSION}
-P ${PROJECT_SOURCE_DIR}/UpdateInfo.cmake) -P ${PROJECT_SOURCE_DIR}/UpdateInfo.cmake)
else() else()