X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=src%2Fvogleditor%2FCMakeLists.txt;h=3ff364caf9179685faddcdb03b060cf18ab5545c;hb=450788d502b6281d5d9fe3e6a0ea0b66a3e116bc;hp=bf2c3c66e3c0f2539db3c1cba96bc7c266d345d5;hpb=5dfa02621fbdbae34adfd4e25faad0268f6a198a;p=vogl

diff --git a/src/vogleditor/CMakeLists.txt b/src/vogleditor/CMakeLists.txt
index bf2c3c6..3ff364c 100644
--- a/src/vogleditor/CMakeLists.txt
+++ b/src/vogleditor/CMakeLists.txt
@@ -2,14 +2,20 @@ 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")
+
+if (NOT DEFINED ENV{QTDIR})
+set(ENV{QTDIR} /usr/local/Trolltech/Qt-4.8.5)
+endif()
 find_package(Qt4 REQUIRED)
 
+find_package(Threads REQUIRED)
+find_package(X11 REQUIRED)
+
 include_directories(
     ${SRC_DIR}
     ${SRC_DIR}/voglcore
     ${SRC_DIR}/voglcommon
-    ${SRC_DIR}/voglinc
+    ${CMAKE_BINARY_DIR}/voglinc
     ${SRC_DIR}/extlib/loki/include/loki
     ${SRC_DIR}/libtelemetry
     ${CMAKE_CURRENT_BINARY_DIR}
@@ -145,16 +151,18 @@ add_executable(${PROJECT_NAME} ${SRC_LIST} ${HEADER_LIST}
         ${QT_GEN_RESOURCE_RCC_LIST}
    )
 
+add_dependencies(${PROJECT_NAME} voglgen_make_inc)
+
 target_link_libraries(${PROJECT_NAME}
 	${QT_QTMAIN_LIBRARY} 
 	${QT_QTCORE_LIBRARY} 
 	${QT_QTGUI_LIBRARY} 
 	${TELEMETRY_LIBRARY}
+	${X11_X11_LIB}
 	backtrace
 	voglcommon
     voglcore
-    X11
-    dl
+    ${CMAKE_DL_LIBS}
    )
 
 build_options_finalize()