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 4b3d4d11061600897f313970b2b1e2f521fe3767..544039a12763a9fe15e3b17c028c41aa14fe4d85 100644 (file)
--- 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 bf2c3c66e3c0f2539db3c1cba96bc7c266d345d5..cfccb7ee60c78787875d7d3f520bcc4f8695b8e4 100644 (file)
--- 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