From: PeterLValve Date: Thu, 27 Mar 2014 00:57:53 +0000 (-0700) Subject: Merge branch 'master' of https://github.com/ValveSoftware/vogl X-Git-Url: https://git.cworth.org/git?p=vogl;a=commitdiff_plain;h=96da0248021a617555bfcfa419eb385485379239;hp=77abd48cbfc1beb012cdc04c1e57335e16244c8e Merge branch 'master' of https://github.com/ValveSoftware/vogl --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fd198d3..a7e7f1a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8) set(SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}") -option(HAS_UPDATED_LIBUNWIND "Build using unw_backtrace_skip" FALSE) +option(HAS_UPDATED_LIBUNWIND "Build using unw_backtrace_skip" TRUE) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") @@ -42,6 +42,3 @@ add_subdirectory(glxspheres) add_subdirectory(vogleditor) add_subdirectory(libbacktrace) add_subdirectory(libbacktrace_test) - -add_subdirectory(libbacktrace) -add_subdirectory(libbacktrace_test)