From 4ab860c4c7cd53844b9faa02e20f69633a974284 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 9 Apr 2024 21:29:49 -0400 Subject: FindJasper: Fix Jasper::Jasper IMPORTED_CONFIGURATIONS In commit 6e8754c625 (FindJasper: Add IMPORTED target, 2021-10-06, v3.22.0-rc1~20^2) this property was not set correctly. This was detected by `CMP0160` because the `IMPORTED` property is read-only. --- Modules/FindJasper.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/FindJasper.cmake b/Modules/FindJasper.cmake index 9a62669..ec2907d 100644 --- a/Modules/FindJasper.cmake +++ b/Modules/FindJasper.cmake @@ -74,14 +74,14 @@ if(JASPER_FOUND) endif() if(EXISTS "${JASPER_LIBRARY_RELEASE}") set_property(TARGET Jasper::Jasper APPEND PROPERTY - IMPORTED CONFIGURATION RELEASE) + IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(Jasper::Jasper PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C" IMPORTED_LOCATION "${JASPER_LIBRARY_RELEASE}") endif() if(EXISTS "${JASPER_LIBRARY_DEBUG}") set_property(TARGET Jasper::Jasper APPEND PROPERTY - IMPORTED CONFIGURATION DEBUG) + IMPORTED_CONFIGURATIONS DEBUG) set_target_properties(Jasper::Jasper PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C" IMPORTED_LOCATION "${JASPER_LIBRARY_DEBUG}") -- cgit v0.12 From 28f4941bc7e7a7254d48d9916bece4f6a0db9272 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 10 Apr 2024 12:18:57 -0400 Subject: ci: Add Jasper to Fedora base image --- .gitlab/ci/docker/fedora39/deps_packages.lst | 1 + .gitlab/os-linux.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab/ci/docker/fedora39/deps_packages.lst b/.gitlab/ci/docker/fedora39/deps_packages.lst index e51a985..1459894 100644 --- a/.gitlab/ci/docker/fedora39/deps_packages.lst +++ b/.gitlab/ci/docker/fedora39/deps_packages.lst @@ -90,6 +90,7 @@ hdf5-devel hdf5-mpich-devel hdf5-openmpi-devel ImageMagick-c++-devel +jasper-devel java-11-openjdk-devel jsoncpp-devel lapack-devel diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index e6e9773..dc32016 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -69,7 +69,7 @@ ### Fedora .fedora39: - image: "kitware/cmake:ci-fedora39-x86_64-2024-03-04" + image: "kitware/cmake:ci-fedora39-x86_64-2024-04-10" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes" -- cgit v0.12 From c6408577d61422fb93d07139e1f377ee80eb592a Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 10 Apr 2024 12:14:07 -0400 Subject: ci: Enable FindJasper test on Fedora --- .gitlab/ci/configure_fedora39_makefiles.cmake | 1 + Tests/FindJasper/Test/CMakeLists.txt | 2 +- Tests/FindJasper/Test/main.c | 18 ++++++------------ 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.gitlab/ci/configure_fedora39_makefiles.cmake b/.gitlab/ci/configure_fedora39_makefiles.cmake index 39fe642..4e18c83 100644 --- a/.gitlab/ci/configure_fedora39_makefiles.cmake +++ b/.gitlab/ci/configure_fedora39_makefiles.cmake @@ -48,6 +48,7 @@ set(CMake_TEST_FindIconv "ON" CACHE BOOL "") set(CMake_TEST_FindICU "ON" CACHE BOOL "") set(CMake_TEST_FindImageMagick "ON" CACHE BOOL "") set(CMake_TEST_FindIntl "ON" CACHE BOOL "") +set(CMake_TEST_FindJasper "ON" CACHE BOOL "") set(CMake_TEST_FindJNI "ON" CACHE BOOL "") set(CMake_TEST_FindJPEG "ON" CACHE BOOL "") set(CMake_TEST_FindJsonCpp "ON" CACHE BOOL "") diff --git a/Tests/FindJasper/Test/CMakeLists.txt b/Tests/FindJasper/Test/CMakeLists.txt index 1e9467d..93873bf 100644 --- a/Tests/FindJasper/Test/CMakeLists.txt +++ b/Tests/FindJasper/Test/CMakeLists.txt @@ -4,7 +4,7 @@ include(CTest) find_package(Jasper) -add_definitions(-DCMAKE_EXPECTED_JASPER_VERSION=${JASPER_VERSION_STRING}) +add_definitions(-DCMAKE_EXPECTED_JASPER_VERSION="${JASPER_VERSION_STRING}") add_executable(test_jasper_tgt main.c) target_link_libraries(test_jasper_tgt Jasper::Jasper) diff --git a/Tests/FindJasper/Test/main.c b/Tests/FindJasper/Test/main.c index 242ff7d..b9dbe1e 100644 --- a/Tests/FindJasper/Test/main.c +++ b/Tests/FindJasper/Test/main.c @@ -1,17 +1,11 @@ -#include -// clang-format off -#include #include -// clang-format on +#include int main(void) { - /* Without any JPEG file to open, test that the call fails as - expected. This tests that linking worked. */ - jas_init(); - jas_image_t* img = jas_image_create0(); - jas_image_destroy(img); - jas_cleanup(); - - return (JAS_VERSION != CMAKE_EXPECTED_JASPER_VERSION); + jas_conf_clear(); + jas_conf_set_max_mem_usage(0x100000); + jas_init_library(); + jas_cleanup_library(); + return strcmp(JAS_VERSION, CMAKE_EXPECTED_JASPER_VERSION); } -- cgit v0.12