From: Michael Sartain Date: Thu, 13 Mar 2014 23:38:06 +0000 (-0700) Subject: Merge pull request #3 from andrewkww/fix_hardcoded_qt_path X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=9bf37d3d589b8a8b92345872a48bcb5669fcdc48;hp=cd54134a22a55a0ad84f169aa96075703d64dd95;p=vogl Merge pull request #3 from andrewkww/fix_hardcoded_qt_path vogleditor: Replace hardcoded Qt path with variables generated by cmake's Qt module --- diff --git a/src/vogleditor/CMakeLists.txt b/src/vogleditor/CMakeLists.txt index ca80dfd..2dc839e 100644 --- a/src/vogleditor/CMakeLists.txt +++ b/src/vogleditor/CMakeLists.txt @@ -13,9 +13,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})