diff --git a/CMakeLists.txt b/CMakeLists.txt index 406da98ad09194671685efcf0ae31c1967ad434f..68afb901b8e22a60c388ecfc63603c04c3e2ffe9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.5) project(jxrlib C) set(JXRLIB_MAJOR 0) @@ -13,6 +13,8 @@ if(ISBIGENDIAN) set(DEF_ENDIAN -D_BIG__ENDIAN_) endif() +include(GNUInstallDirs) + add_definitions(-D__ANSI__ -DDISABLE_PERF_MEASUREMENT ${DEF_ENDIAN}) include_directories( @@ -31,8 +33,8 @@ set_target_properties(jpegxr PROPERTIES VERSION ${JXRLIB_LIB_VERSION} SOVERSION install(TARGETS jpegxr RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) # JXR-GLUE Library @@ -45,8 +47,8 @@ target_link_libraries(jxrglue jpegxr m) install(TARGETS jxrglue RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) # JxrEncApp Executable diff --git a/jxrlib.spec b/jxrlib.spec index 4e9ba6e284979c7e33ce65cf43ccbdc98cae0ed5..67b02e80f64587249636afda27a71d4e5548ddc0 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 2 +Release: 3 Summary: Open source implementation of jpegxr License: BSD @@ -70,6 +70,9 @@ cp -a %{SOURCE2} doc %changelog +* Mon Dec 15 2025 Funda Wang - 1.1-3 +- fix build with cmake 4 + * Wed Nov 20 2024 Funda Wang - 1.1-2 - adopt to new cmake macro