summaryrefslogtreecommitdiffstats
path: root/LogReceiver/CMakeLists.txt
diff options
context:
space:
mode:
authorNiklas2011-09-06 17:15:01 +0200
committerNiklas2011-09-06 17:15:01 +0200
commit8ac203bf967050cc07152ca4a002de6b5d5d26ff (patch)
tree12d8de423c15883471f612cc4009422c5623f4ec /LogReceiver/CMakeLists.txt
parentfinaly managed it to create a .so lib of the customdhcpcd files. the dhcpcd.c... (diff)
downloadfbgui-8ac203bf967050cc07152ca4a002de6b5d5d26ff.tar.gz
fbgui-8ac203bf967050cc07152ca4a002de6b5d5d26ff.tar.xz
fbgui-8ac203bf967050cc07152ca4a002de6b5d5d26ff.zip
latest version of all files. cmake still doesn't work
Diffstat (limited to 'LogReceiver/CMakeLists.txt')
-rw-r--r--LogReceiver/CMakeLists.txt18
1 files changed, 11 insertions, 7 deletions
diff --git a/LogReceiver/CMakeLists.txt b/LogReceiver/CMakeLists.txt
index fa814b3..32f7b6e 100644
--- a/LogReceiver/CMakeLists.txt
+++ b/LogReceiver/CMakeLists.txt
@@ -11,23 +11,26 @@ endif(QT4_FOUND)
#find_package(Qxt REQUIRED)
-set(QT_USE_GUI TRUE)
+#set(QT_USE_CORE TRUE)
+#set(QT_USE_GUI 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_RECURSE LOGRECEIVER_RCS ./*.qrc)
include_directories(${CMAKE_CURRENT_BINARY_DIR}
/usr/include/
- ../customdhcpcd/src/)
+ /home/niklas/fbgui/customdhcpcd/src/
+ /home/niklas/fbgui/LogReceiver/build)
include(${QT_USE_FILE})
add_definitions(${QT_DEFINITIONS})
-link_directories(/usr/lib)
+link_directories(/usr/lib
+ /home/niklas/fbgui/customdhcpcd/src/build)
#add_library(
# /usr/local/Qxt/lib/libQxtCore.so
@@ -35,9 +38,10 @@ link_directories(/usr/lib)
# /usr/lib/libusb-1.0.a
# )
-#QT4_ADD_RESOURCES(FBGUI_RC_SOURCES ${FBGUI_RCS})
-QT4_WRAP_UI(LOGRECEIVER_UI_HEADERS ${LOGRECEIVER_UIS})
+QT4_ADD_RESOURCES(FBGUI_RC_SOURCES ${FBGUI_RCS})
QT4_WRAP_CPP(LOGRECEIVER_MOC_SOURCES ${LOGRECEIVER_MOC_HEADERS})
+QT4_WRAP_UI(LOGRECEIVER_UI_HEADERS ${LOGRECEIVER_UIS})
+
add_executable(LogReceiver
${LOGRECEIVER_SOURCES}
@@ -46,4 +50,4 @@ add_executable(LogReceiver
target_link_libraries(LogReceiver
${QT_LIBRARIES}
- sysfs)
+ sysfs libcustomdhcpcd)