Skip to content
Snippets Groups Projects
Commit 2827bc73 authored by Henry Linjamäki's avatar Henry Linjamäki Committed by Michal Babej
Browse files

Fix couldn't find libjpeg-turbo package built from sources

... due to different package name (libturbojpeg).

Also, run the `test_dbk_jpeg` test.
parent cab3e600
Branches
No related tags found
No related merge requests found
...@@ -1044,11 +1044,12 @@ else() ...@@ -1044,11 +1044,12 @@ else()
endif() endif()
if(ENABLE_HOST_CPU_DEVICES AND NOT ENABLE_CONFORMANCE) if(ENABLE_HOST_CPU_DEVICES AND NOT ENABLE_CONFORMANCE)
pkg_check_modules(LIBJPEG_TURBO libjpeg-turbo>=3.0.0) pkg_search_module(LIBJPEG_TURBO IMPORTED_TARGET
set(HAVE_LIBJPEG_TURBO ${LIBJPEG_TURBO_FOUND}) libjpeg-turbo>=3.0.0 libturbojpeg>=3.0.0)
if(NOT ${HAVE_LIBJPEG_TURBO}) if(NOT LIBJPEG_TURBO_FOUND)
message(STATUS "libjpeg-turbo v3.0.0+ not found, disabled") message(STATUS "libjpeg-turbo v3.0.0+ not found, disabled")
endif() endif()
set(HAVE_LIBJPEG_TURBO ${LIBJPEG_TURBO_FOUND})
endif() endif()
###################################################################################### ######################################################################################
......
...@@ -193,7 +193,7 @@ if(HAVE_LIBXSMM) # for includedir flags ...@@ -193,7 +193,7 @@ if(HAVE_LIBXSMM) # for includedir flags
target_link_libraries("pocl-devices" PRIVATE PkgConfig::LIBXSMM) target_link_libraries("pocl-devices" PRIVATE PkgConfig::LIBXSMM)
endif() endif()
if(HAVE_LIBJPEG_TURBO) if(HAVE_LIBJPEG_TURBO)
target_link_libraries("pocl-devices" PRIVATE libjpeg-turbo::turbojpeg) target_link_libraries("pocl-devices" PRIVATE PkgConfig::LIBJPEG_TURBO)
endif () endif ()
set(POCL_DEVICES_OBJS "${POCL_DEVICES_OBJS}" set(POCL_DEVICES_OBJS "${POCL_DEVICES_OBJS}"
......
if(HAVE_LIBJPEG_TURBO) if(HAVE_LIBJPEG_TURBO)
list(APPEND POCL_DEVICES_LINK_LIST libjpeg-turbo::turbojpeg ) list(APPEND POCL_DEVICES_LINK_LIST PkgConfig::LIBJPEG_TURBO)
endif () endif()
list(APPEND POCL_DEVICES_SOURCES list(APPEND POCL_DEVICES_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/pocl_dbk_khr_jpeg_cpu.c ${CMAKE_CURRENT_SOURCE_DIR}/pocl_dbk_khr_jpeg_cpu.h ${CMAKE_CURRENT_SOURCE_DIR}/pocl_dbk_khr_jpeg_cpu.c ${CMAKE_CURRENT_SOURCE_DIR}/pocl_dbk_khr_jpeg_cpu.h
......
...@@ -158,6 +158,18 @@ add_test(NAME "runtime/test_large_buf" COMMAND "test_large_buf") ...@@ -158,6 +158,18 @@ add_test(NAME "runtime/test_large_buf" COMMAND "test_large_buf")
add_test(NAME "runtime/test_compile_n_link" COMMAND "test_compile_n_link") add_test(NAME "runtime/test_compile_n_link" COMMAND "test_compile_n_link")
if(HAVE_LIBJPEG_TURBO)
add_test(NAME "runtime/test_dbk_jpeg"
COMMAND test_dbk_jpeg 640 480
"${CMAKE_CURRENT_SOURCE_DIR}/test_data/tram.rgb")
set_tests_properties("runtime/test_dbk_jpeg"
PROPERTIES
COST 2.0
PROCESSORS 1
DEPENDS "pocl_version_check"
LABELS "internal;runtime")
endif()
if(OPENCL_HEADER_VERSION GREATER 299) if(OPENCL_HEADER_VERSION GREATER 299)
add_test(NAME "runtime/test_queue_creation_with_hints" COMMAND "test_queue_creation_with_hints") add_test(NAME "runtime/test_queue_creation_with_hints" COMMAND "test_queue_creation_with_hints")
set(OCL_30_TESTS "runtime/test_queue_creation_with_hints") set(OCL_30_TESTS "runtime/test_queue_creation_with_hints")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment