diff options
| author | Sebastian Schmelzer | 2011-12-05 12:55:54 +0100 |
|---|---|---|
| committer | Sebastian Schmelzer | 2011-12-05 12:55:54 +0100 |
| commit | 2108640f1656fb22912538feafa142321a3d02be (patch) | |
| tree | e71c62e78993023a149958c49e92ca56cf86c7fc | |
| parent | codeformating, change to log4cxx (diff) | |
| download | fbgui-2108640f1656fb22912538feafa142321a3d02be.tar.gz fbgui-2108640f1656fb22912538feafa142321a3d02be.tar.xz fbgui-2108640f1656fb22912538feafa142321a3d02be.zip | |
cleanup CmakeList
| -rw-r--r-- | CMakeLists.txt | 25 | ||||
| -rw-r--r-- | src/fbgui/fbgui.cpp | 1 | ||||
| -rw-r--r-- | src/fbgui/fbgui.h | 1 |
3 files changed, 15 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 136923f..16d2a5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/") find_package(PkgConfig) pkg_check_modules(LOG4CXX REQUIRED liblog4cxx) +pkg_check_modules(LIBSYSFS REQUIRED libsysfs) +pkg_check_modules(LIBNL REQUIRED libnl-1) +pkg_check_modules(LIBUSB REQUIRED libusb-1.0) set(QT_MIN_VERSION "4.7.0") @@ -35,18 +38,16 @@ file(GLOB FBGUI_UIS src/fbgui/*.ui) file(GLOB FBGUI_RCS src/fbgui/*.qrc) include_directories(${CMAKE_CURRENT_BINARY_DIR} - /usr/include/ - /usr/include/netlink/ - /usr/include/netlink/route/ ./src/customdhcpcd/ ./src/common ./build + /usr/include/ ${QT_INCLUDES} - ${QXT_INCLUDE_DIRS} ${LOG4CXX_INCLUDES} - /usr/include/qxt/QxtCore - /usr/include/sysfs - /usr/include/libusb-1.0) + ${LIBSYSFS_INCLUDES} + ${LIBNL_INCLUDES} + ${LIBUSB_INCLUDES} +) include(${QT_USE_FILE}) add_definitions(${QT_DEFINITIONS}) @@ -68,7 +69,9 @@ QT4_WRAP_CPP(FBGUI_MOC_SOURCES ${FBGUI_MOC_HEADERS}) add_executable(fbgui ${QT_INCLUDES} - ${QXT_INCLUDES} + ${LIBSYSFS_INCLUDES} + ${LIBNL_INCLUDES} + ${LIBUSB_INCLUDES} ${FBGUI_SOURCES} ${FBGUI_MOC_SOURCES} ${FBGUI_UI_HEADERS} @@ -76,7 +79,9 @@ add_executable(fbgui target_link_libraries(fbgui ${QT_LIBRARIES} - ${QXT_LIBRARIES} ${LOG4CXX_LIBRARIES} + ${LIBSYSFS_LIBRARIES} + ${LIBNL_LIBRARIES} + ${LIBUSB_LIBRARIES} ## QxtCore .. - qjson sysfs usb-1.0 nl) + ) diff --git a/src/fbgui/fbgui.cpp b/src/fbgui/fbgui.cpp index 85a0660..dd956b5 100644 --- a/src/fbgui/fbgui.cpp +++ b/src/fbgui/fbgui.cpp @@ -15,7 +15,6 @@ LoggerPtr coreLogger(Logger::getLogger("fbgui.core")); #include <iostream> #include <QThread> #include <QtWebKit> -#include <QxtCore> QThread dmThread; QString logFilePath(""); diff --git a/src/fbgui/fbgui.h b/src/fbgui/fbgui.h index 7843741..c6d5a01 100644 --- a/src/fbgui/fbgui.h +++ b/src/fbgui/fbgui.h @@ -22,7 +22,6 @@ #include <QWSServer> #include <QtGui> #include <QtWebKit> -#include <QxtCore> // Internal default settings #define DEFAULT_URL "http://www.google.com" |