From f085668d9d83bd0e26a682e0a6bca044dc93fe37 Mon Sep 17 00:00:00 2001 From: radj307 Date: Sat, 2 Mar 2024 20:35:57 -0500 Subject: [PATCH] re-enable macOS build and don't link Boost::stacktrace at all --- .github/workflows/GenerateRelease.yaml | 2 +- ARRCON/CMakeLists.txt | 29 +++++++++++++------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/GenerateRelease.yaml b/.github/workflows/GenerateRelease.yaml index dc738d9..6744838 100644 --- a/.github/workflows/GenerateRelease.yaml +++ b/.github/workflows/GenerateRelease.yaml @@ -49,7 +49,7 @@ jobs: runs-on: ${{matrix.os}} strategy: matrix: - os: [ ubuntu-latest, windows-latest ] + os: [ ubuntu-latest, windows-latest, macos-latest ] fail-fast: true steps: diff --git a/ARRCON/CMakeLists.txt b/ARRCON/CMakeLists.txt index 6370c6b..e2179df 100644 --- a/ARRCON/CMakeLists.txt +++ b/ARRCON/CMakeLists.txt @@ -72,20 +72,21 @@ target_link_libraries(ARRCON PRIVATE Boost::asio ) -# Link Boost::Stacktrace -# see https://www.boost.org/doc/libs/1_81_0/doc/html/stacktrace/configuration_and_build.html -if(ARRCON_DISABLE_STACKTRACE OR CMAKE_BUILD_TYPE STREQUAL "Release") - # Disable stacktrace - target_link_libraries(ARRCON PRIVATE boost_stacktrace_noop) -elseif(MSVC) - # Use COM stacktrace - target_link_libraries(ARRCON PRIVATE boost_stacktrace_windbg ole32 dbgeng) -elseif(APPLE) - # Use addr2line - target_link_libraries(ARRCON PRIVATE boost_stacktrace_basic libdl) -else() - # Use POSIX backtrace - target_link_libraries(ARRCON PRIVATE boost_stacktrace_backtrace dl backtrace) +if (NOT APPLE) + + # Link Boost::Stacktrace + # see https://www.boost.org/doc/libs/1_81_0/doc/html/stacktrace/configuration_and_build.html + if(ARRCON_DISABLE_STACKTRACE OR CMAKE_BUILD_TYPE STREQUAL "Release") + # Disable stacktrace + target_link_libraries(ARRCON PRIVATE boost_stacktrace_noop) + elseif(MSVC) + # Use COM stacktrace + target_link_libraries(ARRCON PRIVATE boost_stacktrace_windbg ole32 dbgeng) + else() + # Use POSIX backtrace + target_link_libraries(ARRCON PRIVATE boost_stacktrace_backtrace dl backtrace) + endif() + endif() include(PackageInstaller)