Implement grouping of calls.

[apitrace] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be493272560806d14967bb48da7e2aee2d41d608..81e5cdcd8f8ada8c8145aa0a18ab48539ba86f54 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,7 +148,7 @@ else ()
     add_definitions (-Wno-sign-compare) # comparison between signed and unsigned integer expressions
 
     # No RTTI required
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
+    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 
     # Use GDB extensions if available
     if (CMAKE_COMPILER_IS_GNUC)
@@ -268,7 +268,8 @@ endif ()
 if (CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF")
     add_subdirectory (thirdparty/libbacktrace)
     include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libbacktrace)
-    set (LIBBACKTRACE_LIBRARIES backtrace)
+    set (LIBBACKTRACE_LIBRARIES dl backtrace)
+    add_definitions (-DHAVE_BACKTRACE=1)
 endif ()
 
 # Always use bundled QJSon.
@@ -331,7 +332,7 @@ add_library (common STATIC
     common/trace_profiler.cpp
     common/trace_option.cpp
     common/${os}
-    common/trace_backtrace.cpp
+    common/os_backtrace.cpp
 )
 
 set_target_properties (common PROPERTIES
@@ -339,6 +340,9 @@ set_target_properties (common PROPERTIES
     COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}"
 )
 
+target_link_libraries (common
+    ${LIBBACKTRACE_LIBRARIES}
+)
 if (ANDROID)
     target_link_libraries (common
         log