--- CMakeLists.txt.orig 2026-10-07 07:39:22 UTC +++ CMakeLists.txt @@ -180,9 +180,12 @@ configure_file(${DEFINES_HXX_CMAKE} ${DEFINES_HXX} @ON configure_file(${DEFINES_HXX_CMAKE} ${DEFINES_HXX} @ONLY) +if(NOT DEFINED CATCH2_INCLUDE_DIR) + set(CATCH2_INCLUDE_DIR ${log4cplus_SOURCE_DIR}/catch/single_include/catch2) +endif() include_directories (${log4cplus_SOURCE_DIR}/include ${log4cplus_SOURCE_DIR}/threadpool - ${log4cplus_SOURCE_DIR}/catch/single_include/catch2 + ${CATCH2_INCLUDE_DIR} ${log4cplus_BINARY_DIR}/include ) @@ -243,7 +246,7 @@ else () if (IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}") set(log4cplus_pc_install_dir "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig") else () - set(log4cplus_pc_install_dir "\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig") + set(log4cplus_pc_install_dir "\${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig") endif () install(CODE "configure_file(\"${log4cplus_pc}\" \"\$ENV{DESTDIR}${log4cplus_pc_install_dir}/log4cplus.pc\" COPYONLY)")