diff options
author | Sebastian Schmelzer | 2011-12-03 13:31:09 +0100 |
---|---|---|
committer | Sebastian Schmelzer | 2011-12-03 13:31:09 +0100 |
commit | 1b48532c662470f5dd4090d47e1e2c333e967caf (patch) | |
tree | 8c23d3eca5fa088b91887d528138b9e0462382fb /CMakeLists.txt | |
parent | let cmake find qxt (diff) | |
download | fbgui-1b48532c662470f5dd4090d47e1e2c333e967caf.tar.gz fbgui-1b48532c662470f5dd4090d47e1e2c333e967caf.tar.xz fbgui-1b48532c662470f5dd4090d47e1e2c333e967caf.zip |
codeformating, change to log4cxx
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bc7ac6..136923f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,10 @@ project(fbgui) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/") +find_package(PkgConfig) +pkg_check_modules(LOG4CXX REQUIRED liblog4cxx) + + set(QT_MIN_VERSION "4.7.0") find_package(Qt4 REQUIRED) if (QT4_FOUND) @@ -16,8 +20,13 @@ endif(QT4_FOUND) set(QT_USE_QTNETWORK TRUE) set(QT_USE_QTWEBKIT TRUE) -find_package(Qxt REQUIRED) -SET(QXT_USE_QXTCORE TRUE) +#find_package(Qxt COMPONENTS QxtCore) +#if (QXT_FOUND) +# message(STATUS "QXT found.") +#else(QXT_FOUND) +# message(FATAL_ERROR "QXT not found!") +#endif(QXT_FOUND) +#SET(QXT_USE_QXTCORE TRUE) file(GLOB FBGUI_SOURCES src/fbgui/*.cpp) @@ -34,6 +43,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ./build ${QT_INCLUDES} ${QXT_INCLUDE_DIRS} + ${LOG4CXX_INCLUDES} + /usr/include/qxt/QxtCore /usr/include/sysfs /usr/include/libusb-1.0) @@ -66,4 +77,6 @@ add_executable(fbgui target_link_libraries(fbgui ${QT_LIBRARIES} ${QXT_LIBRARIES} - qjson sysfs usb-1.0 customdhcpcd nl) + ${LOG4CXX_LIBRARIES} + ## QxtCore .. + qjson sysfs usb-1.0 nl) |