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=-c;p=vogl

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

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

38bc71866f3985963881a74e69483ec2e0cb20d9
diff --combined src/vogleditor/CMakeLists.txt
index bf2c3c6,e63fd93..cfccb7e
--- a/src/vogleditor/CMakeLists.txt
+++ b/src/vogleditor/CMakeLists.txt
@@@ -2,8 -2,9 +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,11 -151,12 +151,13 @@@ target_link_libraries(${PROJECT_NAME
  	${QT_QTCORE_LIBRARY} 
  	${QT_QTGUI_LIBRARY} 
  	${TELEMETRY_LIBRARY}
+ 	${CMAKE_THREAD_LIBS_INIT}
+ 	${X11_X11_LIB}
  	backtrace
  	voglcommon
 -	voglcore
 -	dl
 +    voglcore
 +    X11
 +    dl
     )
  
  build_options_finalize()