diff options
| author | Sebastian Schmelzer | 2011-09-06 18:38:27 +0200 |
|---|---|---|
| committer | Sebastian Schmelzer | 2011-09-06 18:38:27 +0200 |
| commit | b3370cb70705b0ed67f3fd6257b64fe97eec36d6 (patch) | |
| tree | f28de97af83fdb6e27f156cd9b589c19bb3e6df7 | |
| parent | add requirement for qt 4.7 (diff) | |
| download | fbgui-b3370cb70705b0ed67f3fd6257b64fe97eec36d6.tar.gz fbgui-b3370cb70705b0ed67f3fd6257b64fe97eec36d6.tar.xz fbgui-b3370cb70705b0ed67f3fd6257b64fe97eec36d6.zip | |
fix cmake stuff
| -rw-r--r-- | LogReceiver/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | LogReceiver/ndgui.h | 12 | ||||
| -rw-r--r-- | customdhcpcd/src/CMakeLists.txt | 6 |
3 files changed, 16 insertions, 14 deletions
diff --git a/LogReceiver/CMakeLists.txt b/LogReceiver/CMakeLists.txt index f5da228..6b3aedc 100644 --- a/LogReceiver/CMakeLists.txt +++ b/LogReceiver/CMakeLists.txt @@ -17,14 +17,14 @@ set(QT_USE_QTGUI TRUE) set(QT_USE_QTNETWORK TRUE) set(QT_USE_QTWEBKIT TRUE) -file(GLOB_RECURSE LOGRECEIVER_SOURCES ./*.cpp) -file(GLOB_RECURSE LOGRECEIVER_MOC_HEADERS ./*.h) -file(GLOB_RECURSE LOGRECEIVER_UIS ./*.ui) -file(GLOB_RECURSE LOGRECEIVER_RCS ./*.qrc) +file(GLOB LOGRECEIVER_SOURCES ./*.cpp) +file(GLOB LOGRECEIVER_MOC_HEADERS ./*.h) +file(GLOB LOGRECEIVER_UIS ./*.ui) +file(GLOB LOGRECEIVER_RCS ./*.qrc) include_directories(${CMAKE_CURRENT_BINARY_DIR} /usr/include/ - ../customdhcpcd/src/ + ./../customdhcpcd/src/ ./build ${QT_INCLUDES} ) @@ -54,4 +54,4 @@ add_executable(LogReceiver target_link_libraries(LogReceiver ${QT_LIBRARIES} - sysfs libcustomdhcpcd) + sysfs customdhcpcd) diff --git a/LogReceiver/ndgui.h b/LogReceiver/ndgui.h index cca603d..81ab266 100644 --- a/LogReceiver/ndgui.h +++ b/LogReceiver/ndgui.h @@ -2,15 +2,17 @@ #define NDGUI_H #include <QtGui/QWidget> -#include "qprogressbar.h" -#include "qlabel.h" -#include "qgroupbox.h" -#include "qboxlayout.h" -#include "ui_ndgui.h" +#include <QProgressBar> +#include <QLabel> +#include <QGroupBox> +#include <QBoxLayout> + #include "logreceiver.h" #include "chooseinterfacedialog.h" #include "abortbootdialog.h" +#include "ui_ndgui.h" + class ndgui: public QWidget { Q_OBJECT diff --git a/customdhcpcd/src/CMakeLists.txt b/customdhcpcd/src/CMakeLists.txt index 0511204..a716a5a 100644 --- a/customdhcpcd/src/CMakeLists.txt +++ b/customdhcpcd/src/CMakeLists.txt @@ -10,8 +10,8 @@ common.c dhcp.c duid.c ipv4ll.c signal.c) #file(GLOB_RECURSE CUSTOMDHCPCD_SOURCES *.c) file(GLOB_RECURSE CUSTOMDHCPCD_HEADERS *.h) -add_library(libcustomdhcpcd SHARED ${CUSTOMDHCPCD_SOURCES} ${CUSTOMDHCPCD_HEADERS}) +add_library(customdhcpcd SHARED ${CUSTOMDHCPCD_SOURCES} ${CUSTOMDHCPCD_HEADERS}) #add_executable(customdhcpcd ${CUSTOMDHCPCD_SOURCES}) -add_executable(customdhcpcd dhcpcd.c) -target_link_libraries(customdhcpcd libcustomdhcpcd ) +add_executable(cdhcpcd dhcpcd.c) +target_link_libraries(cdhcpcd customdhcpcd ) |