From 20bd544eb6b28bc13b7249fc8c5db10d25916513 Mon Sep 17 00:00:00 2001 From: Sebastian Schmelzer Date: Thu, 1 Dec 2011 13:04:18 +0100 Subject: let cmake find qxt --- CMakeLists.txt | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index bb53f39..8bc7ac6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 2.8) project(fbgui) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/") + set(QT_MIN_VERSION "4.7.0") find_package(Qt4 REQUIRED) if (QT4_FOUND) @@ -10,11 +12,14 @@ else(QT4_FOUND) message(FATAL_ERROR "QT4 not found!") endif(QT4_FOUND) -#find_package(Qxt REQUIRED) set(QT_USE_QTNETWORK TRUE) set(QT_USE_QTWEBKIT TRUE) +find_package(Qxt REQUIRED) +SET(QXT_USE_QXTCORE TRUE) + + file(GLOB FBGUI_SOURCES src/fbgui/*.cpp) file(GLOB FBGUI_MOC_HEADERS src/fbgui/*.h src/common/*.h) file(GLOB FBGUI_UIS src/fbgui/*.ui) @@ -28,15 +33,17 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ./src/common ./build ${QT_INCLUDES} - /usr/local/Qxt/include/QxtCore + ${QXT_INCLUDE_DIRS} /usr/include/sysfs /usr/include/libusb-1.0) include(${QT_USE_FILE}) add_definitions(${QT_DEFINITIONS}) -link_directories(/usr/local/Qxt/lib /usr/lib - /usr/local/lib) +link_directories( + /usr/lib + /usr/local/lib +) #add_library( # /usr/local/Qxt/lib/libQxtCore.so @@ -50,6 +57,7 @@ QT4_WRAP_CPP(FBGUI_MOC_SOURCES ${FBGUI_MOC_HEADERS}) add_executable(fbgui ${QT_INCLUDES} + ${QXT_INCLUDES} ${FBGUI_SOURCES} ${FBGUI_MOC_SOURCES} ${FBGUI_UI_HEADERS} @@ -57,4 +65,5 @@ add_executable(fbgui target_link_libraries(fbgui ${QT_LIBRARIES} - QxtCore qjson sysfs usb-1.0 customdhcpcd nl) + ${QXT_LIBRARIES} + qjson sysfs usb-1.0 customdhcpcd nl) -- cgit v1.2.3-55-g7522