diff --git a/src/svnqt/CMakeLists.txt b/src/svnqt/CMakeLists.txt --- a/src/svnqt/CMakeLists.txt +++ b/src/svnqt/CMakeLists.txt @@ -113,6 +113,11 @@ set_property(TARGET svnqt APPEND PROPERTY COMPILE_FLAGS ${APR_CPP_FLAGS}) set_property(TARGET svnqt PROPERTY CXX_VISIBILITY_PRESET hidden) +if(Backtrace_FOUND) + target_include_directories(svnqt PUBLIC SYSTEM ${Backtrace_INCLUDE_DIRS}) + target_link_libraries(svnqt PUBLIC ${Backtrace_LIBRARY}) +endif() + if(WIN32) target_link_libraries(svnqt wsock32.lib) endif() diff --git a/src/svnqt/cmake/FindSubversion.cmake b/src/svnqt/cmake/FindSubversion.cmake --- a/src/svnqt/cmake/FindSubversion.cmake +++ b/src/svnqt/cmake/FindSubversion.cmake @@ -105,8 +105,9 @@ string(REGEX REPLACE "^ +" "" APU_EXTRA_LDFLAGS "${APU_EXTRA_LDFLAGS}") message(STATUS "Found apu extra ldflags: ${APU_EXTRA_LDFLAGS}") - check_include_files(execinfo.h HAS_BACKTRACE_H) - if(HAS_BACKTRACE_H) + find_package(Backtrace) + if(Backtrace_FOUND) + set(HAS_BACKTRACE_H true) option(USE_BACKTRACE "Generate a backtrace when a svnclient exception is thrown" OFF) endif()