chore(cmake): Fixes to properly build/link Trace on Linux

pocoproject · Sep 16, 2024 · f8106cb · f8106cb
1 parent 877673a
commit f8106cb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt
@@ -168,6 +168,10 @@ else()
 	endif(UNIX AND NOT ANDROID)
 endif(CYGWIN)
 
+if(ENABLE_TRACE)
+	target_link_libraries(Foundation PUBLIC Poco::Trace)
+endif()
+
 if(CMAKE_SYSTEM MATCHES "SunOS")
 	target_compile_definitions(Foundation
 		PUBLIC

diff --git a/Foundation/samples/trace/CMakeLists.txt b/Foundation/samples/trace/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_executable(sample-trace src/trace.cpp)
-target_link_libraries(sample-trace PUBLIC Poco::Trace)
+target_link_libraries(sample-trace PUBLIC Poco::Foundation)
diff --git a/Trace/CMakeLists.txt b/Trace/CMakeLists.txt
@@ -21,26 +21,29 @@ set_target_properties(Trace
 		DEFINE_SYMBOL Trace_EXPORTS
 )
 
-target_include_directories (Trace PRIVATE include/Poco/Trace)
+target_compile_definitions (Trace PRIVATE cpptrace_lib_EXPORTS)
 
-target_compile_definitions (Trace PRIVATE CPPTRACE_STATIC_DEFINE)
-
-if (LINUX)
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 	target_compile_definitions (Trace PRIVATE CPPTRACE_DEMANGLE_WITH_CXXABI CPPTRACE_UNWIND_WITH_UNWIND)
 	target_compile_definitions (Trace PRIVATE CPPTRACE_GET_SYMBOLS_WITH_LIBBACKTRACE)
+	target_link_libraries(Trace PRIVATE backtrace)
 elseif (APPLE)
 	target_compile_definitions (Trace PRIVATE CPPTRACE_DEMANGLE_WITH_CXXABI CPPTRACE_UNWIND_WITH_UNWIND)
 	target_compile_definitions (Trace PRIVATE CPPTRACE_GET_SYMBOLS_WITH_LIBDL)
 elseif(WIN32)
 	target_compile_definitions (Trace PRIVATE CPPTRACE_DEMANGLE_WITH_WINAPI CPPTRACE_UNWIND_WITH_WINAPI)
 	target_compile_definitions (Trace PRIVATE CPPTRACE_GET_SYMBOLS_WITH_DBGHELP NOMINMAX)
 	target_link_libraries(Trace PRIVATE dbghelp)
+else()
+	message(FATAL_ERROR "Poco::Trace: Unsupported platform.")
 endif()
 
-target_link_libraries(Trace PUBLIC Poco::Foundation)
+target_compile_definitions (Trace PUBLIC POCO_ENABLE_TRACE)
+
 target_include_directories(Trace
 	PUBLIC
 		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Poco/Trace>
 		$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 	PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
 )