Removed use of qt4_use_modules from build files

Author: poljvd

CMakeLists.txt

@@ -7,19 +7,19 @@ cmake_minimum_required(VERSION 2.8)
 #set(CMAKE_TOOLCHAIN_FILE /opt/raspberrypi/Toolchain-RaspberryPi.cmake)
 
 # set the build options
-option (ENABLE_DISPMANX "Enable the RPi dispmanx grabber" ON)
-option (ENABLE_SPIDEV   "Enable the SPIDEV device" ON)
-
+option(ENABLE_DISPMANX "Enable the RPi dispmanx grabber" ON)
 message(STATUS "ENABLE_DISPMANX = " ${ENABLE_DISPMANX})
-message(STATUS "ENABLE_SPIDEV   = " ${ENABLE_SPIDEV})
 
-option (ENABLE_V4L2 "Enable the V4L2 grabber" ON)
+option(ENABLE_SPIDEV   "Enable the SPIDEV device" ON)
+message(STATUS "ENABLE_SPIDEV = " ${ENABLE_SPIDEV})
+
+option(ENABLE_V4L2 "Enable the V4L2 grabber" ON)
 message(STATUS "ENABLE_V4L2 = " ${ENABLE_V4L2})
 
 # Createt the configuration file
 # configure a header file to pass some of the CMake settings
 # to the source code
-configure_file ("${PROJECT_SOURCE_DIR}/HyperionConfig.h.in" "${PROJECT_BINARY_DIR}/HyperionConfig.h")
+configure_file("${PROJECT_SOURCE_DIR}/HyperionConfig.h.in" "${PROJECT_BINARY_DIR}/HyperionConfig.h")
 include_directories("${PROJECT_BINARY_DIR}")
 
 # Add project specific cmake modules (find, etc)

libsrc/boblightserver/CMakeLists.txt

@@ -28,9 +28,5 @@ add_library(boblightserver
 
 target_link_libraries(boblightserver
 		hyperion
-		hyperion-utils)
-
-qt4_use_modules(boblightserver
-	Core
-	Gui
-	Network)
+        hyperion-utils
+        ${QT_LIBRARIES})

libsrc/jsonserver/CMakeLists.txt

@@ -37,9 +37,5 @@ add_library(jsonserver
 target_link_libraries(jsonserver
 		hyperion
 		hyperion-utils
-		jsoncpp)
-
-qt4_use_modules(jsonserver
-	Core
-	Gui
-	Network)
+        jsoncpp
+        ${QT_LIBRARIES})

libsrc/protoserver/CMakeLists.txt

@@ -44,9 +44,5 @@ add_library(protoserver
 target_link_libraries(protoserver
 		hyperion
 		hyperion-utils
-		${PROTOBUF_LIBRARIES})
-
-qt4_use_modules(protoserver
-	Core
-	Gui
-	Network)
+        ${PROTOBUF_LIBRARIES}
+        ${QT_LIBRARIES})

src/hyperion-remote/CMakeLists.txt

@@ -28,11 +28,7 @@ add_executable(hyperion-remote
 	${hyperion-remote_HEADERS}
 	${hyperion-remote_SOURCES})
 
-qt4_use_modules(hyperion-remote
-	Core
-	Gui
-	Network)
-
 target_link_libraries(hyperion-remote
 	jsoncpp
-	getoptPlusPlus)
+    getoptPlusPlus
+    ${QT_LIBRARIES})

src/hyperion-v4l2/CMakeLists.txt

@@ -49,9 +49,5 @@ target_link_libraries(hyperion-v4l2
 	hyperion-utils
 	${PROTOBUF_LIBRARIES}
 	pthread
+    ${QT_LIBRARIES}
 )
-
-qt4_use_modules(hyperion-v4l2
-	Core
-	Gui
-	Network)