diff options
author | Niklas Goby | 2011-11-23 12:40:03 +0100 |
---|---|---|
committer | Niklas Goby | 2011-11-23 12:40:03 +0100 |
commit | 85bf21b866d540e5d61b515493d83829fe159ca2 (patch) | |
tree | 173e05d20df7bbf875a28c4f1c2e84451686abc9 | |
parent | created modules (diff) | |
download | fbgui-85bf21b866d540e5d61b515493d83829fe159ca2.tar.gz fbgui-85bf21b866d540e5d61b515493d83829fe159ca2.tar.xz fbgui-85bf21b866d540e5d61b515493d83829fe159ca2.zip |
modified cmakelists, changed include paths
-rw-r--r-- | AUTHORS | 3 | ||||
-rw-r--r-- | CMakeLists.txt | 12 | ||||
-rw-r--r-- | README | 1 | ||||
-rw-r--r-- | src/customdhcpcd/logwriter.c | 2 |
4 files changed, 10 insertions, 8 deletions
@@ -1,8 +1,9 @@ Master-Teamproject at Lehrstuhl fuer Kommunikationssysteme for Uni Freiburg, 2010-2011. Sub-Project: Framebuffer-GUI "fbgui" +Sub-Project: NetworkDiscovery "ndgui" Authors: Jonathan Bauer <bauer at informatik.uni-freiburg.de> -Niklas Goby <...> +Niklas Goby <goby at informatik.uni-freiburg.de> Sebastian Wagner <sebastian.wagner at mars.uni-freiburg.de> diff --git a/CMakeLists.txt b/CMakeLists.txt index 6383b26..bb53f39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,17 +15,17 @@ endif(QT4_FOUND) set(QT_USE_QTNETWORK TRUE) set(QT_USE_QTWEBKIT TRUE) -file(GLOB FBGUI_SOURCES src/*.cpp) -file(GLOB FBGUI_MOC_HEADERS src/*.h common/*.h) -file(GLOB FBGUI_UIS src/*.ui) -file(GLOB FBGUI_RCS src/*.qrc) +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) +file(GLOB FBGUI_RCS src/fbgui/*.qrc) include_directories(${CMAKE_CURRENT_BINARY_DIR} /usr/include/ /usr/include/netlink/ /usr/include/netlink/route/ - ./customdhcpcd/src/ - ./common + ./src/customdhcpcd/ + ./src/common ./build ${QT_INCLUDES} /usr/local/Qxt/include/QxtCore @@ -31,3 +31,4 @@ Dependancies: QXT-Framework (QT extension) sysfsutils (QJSon) + libnl diff --git a/src/customdhcpcd/logwriter.c b/src/customdhcpcd/logwriter.c index 6230d4c..ee8bb1d 100644 --- a/src/customdhcpcd/logwriter.c +++ b/src/customdhcpcd/logwriter.c @@ -18,7 +18,7 @@ #include "logger.h" #include "logwriter.h" -#include "../../common/fbgui.h" // for constants +#include "../common/fbgui.h" // for constants /*sockets for the logger and the qt-reader */ int sockfd, ns; int retval = -1; |