finaly clean cmake files

3 files changed, 69 insertions, 12 deletions

diff --git a/src/customdhcpcd/CMakeLists.txt b/src/customdhcpcd/CMakeLists.txt
index a716a5a..f257ab2 100644
--- a/src/customdhcpcd/CMakeLists.txt
+++ b/src/customdhcpcd/CMakeLists.txt
@@ -1,17 +1,10 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(customdhcpdcd)
-
-set(CMAKE_C_FLAGS "-lrt")
-
-set(CUSTOMDHCPCD_SOURCES arp.c configure.c info.c logger.c socket.c client.c discover.c interface.c logwriter.c
-common.c dhcp.c duid.c ipv4ll.c signal.c)
-
-#file(GLOB_RECURSE CUSTOMDHCPCD_SOURCES *.c)
+file(GLOB_RECURSE CUSTOMDHCPCD_SOURCES *.c)
 file(GLOB_RECURSE CUSTOMDHCPCD_HEADERS *.h)
 
 add_library(customdhcpcd SHARED ${CUSTOMDHCPCD_SOURCES} ${CUSTOMDHCPCD_HEADERS})
+target_link_libraries(customdhcpcd rt)
 
 #add_executable(customdhcpcd ${CUSTOMDHCPCD_SOURCES})
 add_executable(cdhcpcd dhcpcd.c)
-target_link_libraries(cdhcpcd customdhcpcd )
+set_target_properties(cdhcpcd PROPERTIES LINKER_LANGUAGE C)
+target_link_libraries(cdhcpcd customdhcpcd)
diff --git a/src/customdhcpcd/logwriter.c b/src/customdhcpcd/logwriter.c
index e3316cb..5437438 100644
--- a/src/customdhcpcd/logwriter.c
+++ b/src/customdhcpcd/logwriter.c
@@ -89,7 +89,7 @@ void sendToQt(log_msg * msg)
                  msg->substatus, msg->msg);
   if (ret < 1)
     {
-      log ger(LOG_INFO, "[fbgui] ERROR filling message buffer");
+      logger(LOG_INFO, "[fbgui] ERROR filling message buffer");
       //syslog(LOG_INFO, "[fbgui] ERROR filling message buffer");
       return;
     }
diff --git a/src/fbgui/CMakeLists.txt b/src/fbgui/CMakeLists.txt
new file mode 100644
index 0000000..434428f
--- /dev/null
+++ b/src/fbgui/CMakeLists.txt
@@ -0,0 +1,64 @@
+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")
+find_package(Qt4 REQUIRED)
+if (QT4_FOUND)
+  message(STATUS "QT4 found.")
+else(QT4_FOUND)
+  message(FATAL_ERROR "QT4 not found!")
+endif(QT4_FOUND)
+
+set(QT_USE_QTNETWORK TRUE)
+set(QT_USE_QTWEBKIT TRUE)
+
+file(GLOB FBGUI_SOURCES src/fbgui/*.cpp)
+file(GLOB FBGUI_HEADERS src/fbgui/*.h src/common/*.h)
+file(GLOB FBGUI_MOC_HEADERS  
+src/fbgui/downloadmanager.h
+src/fbgui/interfaceconfiguration.h
+src/fbgui/javascriptinterface.h
+src/fbgui/ndgui.h
+src/fbgui/networkdiscovery.h
+src/fbgui/networkmanager.h
+src/fbgui/fbgui.h)
+file(GLOB FBGUI_UIS src/fbgui/*.ui)
+file(GLOB FBGUI_RCS src/fbgui/*.qrc)
+ 
+include_directories(${CMAKE_CURRENT_BINARY_DIR} 
+  /usr/include/
+  ${QT_INCLUDES}
+  ${LOG4CXX_INCLUDES}
+  ${LIBSYSFS_INCLUDES}
+  ${LIBNL_INCLUDES}
+  ${LIBUSB_INCLUDES}
+)
+  
+include(${QT_USE_FILE})
+add_definitions(${QT_DEFINITIONS})
+
+QT4_ADD_RESOURCES(FBGUI_RC_SOURCES ${FBGUI_RCS})
+QT4_WRAP_UI(FBGUI_UI_HEADERS ${FBGUI_UIS})
+QT4_WRAP_CPP(FBGUI_MOC_SOURCES ${FBGUI_MOC_HEADERS})
+
+add_executable(fbgui
+  ${QT_INCLUDES}
+  ${LIBSYSFS_INCLUDES}
+  ${LIBNL_INCLUDES}
+  ${LIBUSB_INCLUDES}
+  ${FBGUI_SOURCES}
+  ${FBGUI_MOC_SOURCES}
+  ${FBGUI_UI_HEADERS}
+  ${FBGUI_RC_SOURCES})
+
+set_target_properties(fbgui PROPERTIES LINKER_LANGUAGE C)
+target_link_libraries(fbgui 
+  ${QT_LIBRARIES}
+  ${LOG4CXX_LIBRARIES}
+  ${LIBSYSFS_LIBRARIES}
+  ${LIBNL_LIBRARIES}
+  ${LIBUSB_LIBRARIES}
+  customdhcpcd
+)