X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=src%2Fvogleditor%2FCMakeLists.txt;h=e63fd93b886bcd2162023d60781572dd76b92fe2;hb=9efcfb2c254b732a4d9494c08ad6641cebb7ce79;hp=ca80dfd8f6c1439b8e8fdabffec5996397c8e8d3;hpb=efdbc27f2074c559c8bbd4c118c45fda53e7aa7a;p=vogl

diff --git a/src/vogleditor/CMakeLists.txt b/src/vogleditor/CMakeLists.txt
index ca80dfd..e63fd93 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}
@@ -13,9 +14,9 @@ include_directories(
     ${SRC_DIR}/extlib/loki/include/loki
     ${SRC_DIR}/libtelemetry
     ${CMAKE_CURRENT_BINARY_DIR}
-    /usr/local/Trolltech/Qt-4.8.5/include
-    /usr/local/Trolltech/Qt-4.8.5/include/QtCore
-    /usr/local/Trolltech/Qt-4.8.5/include/QtGui
+    ${QT_INCLUDE_DIR}
+    ${QT_QTCORE_INCLUDE_DIR}
+    ${QT_QTGUI_INCLUDE_DIR}
 )
 
 #include(${QT_USE_FILE})
@@ -150,9 +151,12 @@ target_link_libraries(${PROJECT_NAME}
 	${QT_QTCORE_LIBRARY} 
 	${QT_QTGUI_LIBRARY} 
 	${TELEMETRY_LIBRARY}
+	${CMAKE_THREAD_LIBS_INIT}
+	${X11_X11_LIB}
 	backtrace
 	voglcommon
-    voglcore
+	voglcore
+	dl
    )
 
 build_options_finalize()