re-enable macOS build and don't link Boost::stacktrace at all

radj307 · Mar 3, 2024 · f085668 · f085668
1 parent 6281463
commit f085668
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git 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
@@ -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)