Default QTDIR to /usr/local/Trolltech/Qt-4.8.5 if not set.

[vogl] / src / vogleditor / CMakeLists.txt

diff --git a/src/vogleditor/CMakeLists.txt b/src/vogleditor/CMakeLists.txt
index e63fd93b886bcd2162023d60781572dd76b92fe2..75f5d077a9e7d75fff94731385c22c13522bcfba 100644 (file)
--- a/src/vogleditor/CMakeLists.txt
+++ b/src/vogleditor/CMakeLists.txt
@@ -2,7 +2,12 @@ project(vogleditor)
 cmake_minimum_required(VERSION 2.8.9)
 
 include("${SRC_DIR}/build_options.cmake")
+
+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)
 
@@ -151,12 +156,11 @@ 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
+    ${CMAKE_DL_LIBS}
    )
 
 build_options_finalize()