From: Michael Sartain <mikesart@valvesoftware.com>
Date: Fri, 14 Mar 2014 15:56:39 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/stativ/vogl into stativ-master
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=38bc71866f3985963881a74e69483ec2e0cb20d9;hp=c3e6b8e41e67b2faf4475dc8f0ba2633f24b2b2f;p=vogl

Merge branch 'master' of https://github.com/stativ/vogl into stativ-master

Conflicts:
	src/vogleditor/CMakeLists.txt
---

diff --git a/src/libbacktrace/CMakeLists.txt b/src/libbacktrace/CMakeLists.txt
index 4b3d4d1..544039a 100644
--- a/src/libbacktrace/CMakeLists.txt
+++ b/src/libbacktrace/CMakeLists.txt
@@ -149,12 +149,15 @@ configure_file (backtrace-supported.h.in backtrace-supported.h)
 
 configure_file (config.h.in.cmake config.h)
 
+find_path(LIBUNWIND_INCLUDE_DIR libunwind.h)
+
 include_directories (BEFORE
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 include_directories (
     auxincl
     ${SRC_DIR}/voglcore
+    ${LIBUNWIND_INCLUDE_DIR}
 )
 add_library (backtrace STATIC EXCLUDE_FROM_ALL
     ${BACKTRACE_FILE}
diff --git a/src/vogleditor/CMakeLists.txt b/src/vogleditor/CMakeLists.txt
index bf2c3c6..cfccb7e 100644
--- a/src/vogleditor/CMakeLists.txt
+++ b/src/vogleditor/CMakeLists.txt
@@ -2,8 +2,9 @@ project(vogleditor)
 cmake_minimum_required(VERSION 2.8.9)
 
 include("${SRC_DIR}/build_options.cmake")
-set (QT_QMAKE_EXECUTABLE "/usr/local/Trolltech/Qt-4.8.5/bin/qmake")
 find_package(Qt4 REQUIRED)
+find_package(Threads REQUIRED)
+find_package(X11 REQUIRED)
 
 include_directories(
     ${SRC_DIR}
@@ -150,6 +151,8 @@ target_link_libraries(${PROJECT_NAME}
 	${QT_QTCORE_LIBRARY} 
 	${QT_QTGUI_LIBRARY} 
 	${TELEMETRY_LIBRARY}
+	${CMAKE_THREAD_LIBS_INIT}
+	${X11_X11_LIB}
 	backtrace
 	voglcommon
     voglcore