update to cmake 2.8.12 (#451)

* update

* resolve qt5w

* test

* Go down

cmake python search won the price for crazy lib searches!

* 2.7 python forced, RPATH

* upstream

* ...

* update

* ...

* 2.7.12 py it picks random versions...

* max 7.12.5....

* Test 14.04 tests

libsrc/boblightserver/CMakeLists.txt

@@ -3,27 +3,19 @@
 set(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/boblightserver)
 set(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/boblightserver)
 
-# Group the headers that go through the MOC compiler
-set(BoblightServer_QT_HEADERS
+set(BoblightServer_HEADERS
 	${CURRENT_HEADER_DIR}/BoblightServer.h
 	${CURRENT_SOURCE_DIR}/BoblightClientConnection.h
 )
 
-set(BoblightServer_HEADERS
-)
-
 set(BoblightServer_SOURCES
 	${CURRENT_SOURCE_DIR}/BoblightServer.cpp
 	${CURRENT_SOURCE_DIR}/BoblightClientConnection.cpp
 )
 
-qt5_wrap_cpp(BoblightServer_HEADERS_MOC ${BoblightServer_QT_HEADERS})
-
 add_library(boblightserver
 	${BoblightServer_HEADERS}
-	${BoblightServer_QT_HEADERS}
 	${BoblightServer_SOURCES}
-	${BoblightServer_HEADERS_MOC}
 )
 
 target_link_libraries(boblightserver

libsrc/bonjour/CMakeLists.txt

@@ -3,14 +3,10 @@
 set(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/bonjour)
 set(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/bonjour)
 
-# Group the headers that go through the MOC compiler
-set(Bonjour_QT_HEADERS
-		${CURRENT_HEADER_DIR}/bonjourserviceregister.h
-		${CURRENT_HEADER_DIR}/bonjourservicebrowser.h
-		${CURRENT_HEADER_DIR}/bonjourserviceresolver.h
-)
-
 set(Bonjour_HEADERS
+	${CURRENT_HEADER_DIR}/bonjourserviceregister.h
+	${CURRENT_HEADER_DIR}/bonjourservicebrowser.h
+	${CURRENT_HEADER_DIR}/bonjourserviceresolver.h
 )
 
 set(Bonjour_SOURCES
@@ -22,24 +18,20 @@ set(Bonjour_SOURCES
 #set(Bonjour_RESOURCES
 #)
 
-qt5_wrap_cpp(Bonjour_HEADERS_MOC ${Bonjour_QT_HEADERS})
 #qt5_add_resources(Bonjour_RESOURCES_RCC ${Bonjour_RESOURCES} OPTIONS "-no-compress")
 
 add_library(bonjour
 		${Bonjour_HEADERS}
-		${Bonjour_QT_HEADERS}
 		${Bonjour_SOURCES}
 		${Bonjour_RESOURCES}
-		${Bonjour_HEADERS_MOC}
 		${Bonjour_RESOURCES_RCC}
 )
 
-qt5_use_modules(bonjour Network)
-
 target_link_libraries(bonjour
 		hyperion
 		hyperion-utils
-        ${QT_LIBRARIES})
+		Qt5::Network
+)
 
 IF (NOT APPLE)
 	set(USE_SHARED_AVAHI_LIBS ${DEFAULT_USE_SHARED_AVAHI_LIBS} CACHE BOOL "use avahi libraries from system")

libsrc/commandline/CMakeLists.txt

@@ -35,8 +35,7 @@ add_library(commandline
     ${Parser_SOURCES}
 )
 
-qt5_use_modules(commandline Gui)
-
 target_link_libraries(commandline
     hyperion
+    Qt5::Gui
 )

libsrc/effectengine/CMakeLists.txt

@@ -1,7 +1,5 @@
-
-find_package(PythonLibs REQUIRED)
-#OpenElec uses 2.7, if you want to compile for OpenElec require 2.7
-#find_package(PythonLibs 2.7 REQUIRED)
+find_package(PythonLibs 2.7 REQUIRED)
+message( STATUS "PYTHON VERSIONS FOUND: ${PYTHONLIBS_VERSION_STRING}" )
 
 # Include the python directory. Also include the parent (which is for example /usr/include)
 # which may be required when it is not includes by the (cross-) compiler by default.
@@ -11,14 +9,10 @@ include_directories(${PYTHON_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}/..)
 SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/effectengine)
 SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/effectengine)
 
-# Group the headers that go through the MOC compiler
-SET(EffectEngineQT_HEADERS
-	${CURRENT_HEADER_DIR}/EffectEngine.h
-	${CURRENT_SOURCE_DIR}/Effect.h
-)
-
 SET(EffectEngineHEADERS
 	${CURRENT_HEADER_DIR}/EffectDefinition.h
+	${CURRENT_HEADER_DIR}/EffectEngine.h
+	${CURRENT_SOURCE_DIR}/Effect.h
 )
 
 SET(EffectEngineSOURCES
@@ -37,20 +31,16 @@ CONFIGURE_FILE(${CURRENT_SOURCE_DIR}/EffectEngine.qrc.in ${CMAKE_BINARY_DIR}/Eff
 
 SET(EffectEngine_RESOURCES ${CMAKE_BINARY_DIR}/EffectEngine.qrc)
 
-QT5_WRAP_CPP(EffectEngineHEADERS_MOC ${EffectEngineQT_HEADERS})
 qt5_add_resources(EffectEngine_RESOURCES_RCC ${EffectEngine_RESOURCES} ) # OPTIONS "-no-compress"
 
 add_library(effectengine
 	${EffectEngineHEADERS}
-	${EffectEngineQT_HEADERS}
-	${EffectEngineHEADERS_MOC}
 	${EffectEngine_RESOURCES_RCC}
 	${EffectEngineSOURCES}
 )
 
-qt5_use_modules(effectengine Core Gui)
-
 target_link_libraries(effectengine
 	hyperion
-	${QT_LIBRARIES}
+	Qt5::Core
+	Qt5::Gui
 	${PYTHON_LIBRARIES})

libsrc/effectengine/EffectEngine.cpp

@@ -1,5 +1,6 @@
 // Python includes
 #include <Python.h>
+#undef B0
 
 // Stl includes
 #include <fstream>

libsrc/grabber/amlogic/CMakeLists.txt

@@ -4,11 +4,9 @@ INCLUDE (CheckIncludeFiles)
 SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/grabber)
 SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/grabber/amlogic)
 
-# Group the headers that go through the MOC compiler
-SET(AmlogicQT_HEADERS ${CURRENT_HEADER_DIR}/AmlogicWrapper.h)
-
 SET(AmlogicHEADERS
 	${CURRENT_HEADER_DIR}/AmlogicGrabber.h
+	${CURRENT_HEADER_DIR}/AmlogicWrapper.h
 )
 
 SET(AmlogicSOURCES
@@ -16,8 +14,6 @@ SET(AmlogicSOURCES
 	${CURRENT_SOURCE_DIR}/AmlogicGrabber.cpp
 )
 
-QT5_WRAP_CPP(AmlogicHEADERS_MOC ${AmlogicQT_HEADERS})
-
 CHECK_INCLUDE_FILES ("amcodec/amports/amstream.h" HAVE_AML_HEADER)
 IF (${HAVE_AML_HEADER})
 	ADD_DEFINITIONS( -DHAVE_AML_HEADER )
@@ -26,12 +22,9 @@ ENDIF()
 
 add_library(amlogic-grabber
 	${AmlogicHEADERS}
-	${AmlogicQT_HEADERS}
-	${AmlogicHEADERS_MOC}
 	${AmlogicSOURCES}
 )
 
 target_link_libraries(amlogic-grabber
 	hyperion
 	${QT_LIBRARIES})
-	

libsrc/grabber/dispmanx/CMakeLists.txt

@@ -7,12 +7,8 @@ include_directories(${BCM_INCLUDE_DIRS})
 SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/grabber)
 SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/grabber/dispmanx)
 
-# Group the headers that go through the MOC compiler
-SET(DispmanxGrabberQT_HEADERS
-	${CURRENT_HEADER_DIR}/DispmanxWrapper.h
-)
-
 SET(DispmanxGrabberHEADERS
+	${CURRENT_HEADER_DIR}/DispmanxWrapper.h
 	${CURRENT_HEADER_DIR}/DispmanxFrameGrabber.h
 )
 
@@ -21,12 +17,8 @@ SET(DispmanxGrabberSOURCES
 	${CURRENT_SOURCE_DIR}/DispmanxFrameGrabber.cpp
 )
 
-QT5_WRAP_CPP(DispmanxGrabberHEADERS_MOC ${DispmanxGrabberQT_HEADERS})
-
 add_library(dispmanx-grabber
 	${DispmanxGrabberHEADERS}
-	${DispmanxGrabberQT_HEADERS}
-	${DispmanxGrabberHEADERS_MOC}
 	${DispmanxGrabberSOURCES}
 )
 

libsrc/grabber/framebuffer/CMakeLists.txt

@@ -7,13 +7,9 @@
 SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/grabber)
 SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/grabber/framebuffer)
 
-# Group the headers that go through the MOC compiler
-SET(FramebufferGrabberQT_HEADERS
-	${CURRENT_HEADER_DIR}/FramebufferWrapper.h
-)
-
 SET(FramebufferGrabberHEADERS
 	${CURRENT_HEADER_DIR}/FramebufferFrameGrabber.h
+	${CURRENT_HEADER_DIR}/FramebufferWrapper.h
 )
 
 SET(FramebufferGrabberSOURCES
@@ -21,12 +17,8 @@ SET(FramebufferGrabberSOURCES
 	${CURRENT_SOURCE_DIR}/FramebufferFrameGrabber.cpp
 )
 
-QT5_WRAP_CPP(FramebufferGrabberHEADERS_MOC ${FramebufferGrabberQT_HEADERS})
-
 add_library(framebuffer-grabber
 	${FramebufferGrabberHEADERS}
-	${FramebufferGrabberQT_HEADERS}
-	${FramebufferGrabberHEADERS_MOC}
 	${FramebufferGrabberSOURCES}
 )
 

libsrc/grabber/osx/CMakeLists.txt

@@ -2,12 +2,8 @@
 SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/grabber)
 SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/grabber/osx)
 
-# Group the headers that go through the MOC compiler
-SET(OsxGrabberQT_HEADERS
-	${CURRENT_HEADER_DIR}/OsxWrapper.h
-)
-
 SET(OsxGrabberHEADERS
+	${CURRENT_HEADER_DIR}/OsxWrapper.h
 	${CURRENT_HEADER_DIR}/OsxFrameGrabber.h
 )
 
@@ -16,12 +12,8 @@ SET(OsxGrabberSOURCES
 	${CURRENT_SOURCE_DIR}/OsxFrameGrabber.cpp
 )
 
-QT5_WRAP_CPP(OsxGrabberHEADERS_MOC ${OsxGrabberQT_HEADERS})
-
 add_library(osx-grabber
 	${OsxGrabberHEADERS}
-	${OsxGrabberQT_HEADERS}
-	${OsxGrabberHEADERS_MOC}
 	${OsxGrabberSOURCES}
 )
 

libsrc/grabber/v4l2/CMakeLists.txt

@@ -2,12 +2,9 @@
 SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/grabber)
 SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/grabber/v4l2)
 
-SET(V4L2_QT_HEADERS
+SET(V4L2_HEADERS
 	${CURRENT_HEADER_DIR}/V4L2Grabber.h
 	${CURRENT_HEADER_DIR}/V4L2Wrapper.h
-)
-
-SET(V4L2_HEADERS
 	${CURRENT_HEADER_DIR}/VideoStandard.h
 )
 
@@ -16,13 +13,9 @@ SET(V4L2_SOURCES
 	${CURRENT_SOURCE_DIR}/V4L2Wrapper.cpp
 )
 
-QT5_WRAP_CPP(V4L2_HEADERS_MOC ${V4L2_QT_HEADERS})
-
 add_library(v4l2-grabber
 	${V4L2_HEADERS}
 	${V4L2_SOURCES}
-	${V4L2_QT_HEADERS}
-	${V4L2_HEADERS_MOC}
 )
 
 target_link_libraries(v4l2-grabber

libsrc/grabber/x11/CMakeLists.txt

@@ -6,14 +6,11 @@ SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/grabber/x11)
 find_package(X11 REQUIRED)
 
 include_directories(
-	${QT_INCLUDES}
 	${X11_INCLUDES}
 )
-SET(X11_QT_HEADERS
-	${CURRENT_HEADER_DIR}/X11Wrapper.h
-)
 
 SET(X11_HEADERS
+	${CURRENT_HEADER_DIR}/X11Wrapper.h
 	${CURRENT_HEADER_DIR}/X11Grabber.h
 )
 
@@ -22,18 +19,13 @@ SET(X11_SOURCES
 	${CURRENT_SOURCE_DIR}/X11Wrapper.cpp
 )
 
-QT5_WRAP_CPP(X11_HEADERS_MOC ${X11_QT_HEADERS})
-
 add_library(x11-grabber
 	${X11_HEADERS}
 	${X11_SOURCES}
-	${X11_QT_HEADERS}
-	${X11_HEADERS_MOC}
 )
 
 target_link_libraries(x11-grabber
 	hyperion
 		${X11_LIBRARIES}
 		${X11_Xrender_LIB}
-		${QT_LIBRARIES}
 )

libsrc/hyperion/CMakeLists.txt

@@ -3,17 +3,6 @@
 SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/hyperion)
 SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/hyperion)
 
-# Group the headers that go through the MOC compiler
-SET(Hyperion_QT_HEADERS
-	${CURRENT_HEADER_DIR}/Hyperion.h
-	${CURRENT_HEADER_DIR}/ImageProcessor.h
-
-	${CURRENT_SOURCE_DIR}/LinearColorSmoothing.h
-	${CURRENT_HEADER_DIR}/GrabberWrapper.h
-	${CURRENT_HEADER_DIR}/ComponentRegister.h
-	${CURRENT_HEADER_DIR}/PriorityMuxer.h
-)
-
 SET(Hyperion_HEADERS
 	${CURRENT_HEADER_DIR}/ImageProcessorFactory.h
 	${CURRENT_HEADER_DIR}/ImageToLedsMap.h
@@ -21,6 +10,14 @@ SET(Hyperion_HEADERS
 
 	${CURRENT_SOURCE_DIR}/MultiColorAdjustment.h
 	${CURRENT_HEADER_DIR}/MessageForwarder.h
+
+	${CURRENT_HEADER_DIR}/Hyperion.h
+	${CURRENT_HEADER_DIR}/ImageProcessor.h
+
+	${CURRENT_SOURCE_DIR}/LinearColorSmoothing.h
+	${CURRENT_HEADER_DIR}/GrabberWrapper.h
+	${CURRENT_HEADER_DIR}/ComponentRegister.h
+	${CURRENT_HEADER_DIR}/PriorityMuxer.h
 )
 
 SET(Hyperion_SOURCES
@@ -42,13 +39,10 @@ SET(Hyperion_RESOURCES
 	${CURRENT_SOURCE_DIR}/resource.qrc
 )
 
-QT5_WRAP_CPP(Hyperion_HEADERS_MOC ${Hyperion_QT_HEADERS})
 QT5_ADD_RESOURCES(Hyperion_RESOURCES_RCC ${Hyperion_RESOURCES} OPTIONS "-no-compress")
 
 add_library(hyperion
 	${Hyperion_HEADERS}
-	${Hyperion_QT_HEADERS}
-	${Hyperion_HEADERS_MOC}
 	${Hyperion_SOURCES}
 	${Hyperion_RESOURCES_RCC}
 )
@@ -58,5 +52,6 @@ target_link_libraries(hyperion
 	hyperion-utils
 	leddevice
 	bonjour
+	effectengine
 	${QT_LIBRARIES}
 )

libsrc/jsonserver/CMakeLists.txt

@@ -3,39 +3,22 @@
 set(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/jsonserver)
 set(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/jsonserver)
 
-# Group the headers that go through the MOC compiler
-set(JsonServer_QT_HEADERS
+set(JsonServer_HEADERS
 	${CURRENT_HEADER_DIR}/JsonServer.h
 	${CURRENT_SOURCE_DIR}/JsonClientConnection.h
 )
 
-set(JsonServer_HEADERS
-)
-
 set(JsonServer_SOURCES
 	${CURRENT_SOURCE_DIR}/JsonServer.cpp
 	${CURRENT_SOURCE_DIR}/JsonClientConnection.cpp
 )
 
-set(JsonServer_RESOURCES
-	${CURRENT_SOURCE_DIR}/JsonSchemas.qrc
-)
-
-qt5_wrap_cpp(JsonServer_HEADERS_MOC ${JsonServer_QT_HEADERS})
-qt5_add_resources(JsonServer_RESOURCES_RCC ${JsonServer_RESOURCES} OPTIONS "-no-compress")
-
 add_library(jsonserver
 	${JsonServer_HEADERS}
-	${JsonServer_QT_HEADERS}
 	${JsonServer_SOURCES}
-	${JsonServer_RESOURCES}
-	${JsonServer_HEADERS_MOC}
-	${JsonServer_RESOURCES_RCC}
 )
 
-qt5_use_modules(jsonserver Network Gui)
-
 target_link_libraries(jsonserver
 	hyperion
-	hyperion-utils
-	${QT_LIBRARIES})
+	Qt5::Network
+	Qt5::Gui)

libsrc/jsonserver/JsonSchemas.qrc

@@ -1,21 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file alias="schema">schema/schema.json</file>
-        <file alias="schema-color">schema/schema-color.json</file>
-        <file alias="schema-image">schema/schema-image.json</file>
-        <file alias="schema-serverinfo">schema/schema-serverinfo.json</file>
-        <file alias="schema-sysinfo">schema/schema-sysinfo.json</file>
-        <file alias="schema-clear">schema/schema-clear.json</file>
-        <file alias="schema-clearall">schema/schema-clearall.json</file>
-        <file alias="schema-adjustment">schema/schema-adjustment.json</file>
-        <file alias="schema-effect">schema/schema-effect.json</file>
-        <file alias="schema-create-effect">schema/schema-create-effect.json</file>
-        <file alias="schema-delete-effect">schema/schema-delete-effect.json</file>
-        <file alias="schema-sourceselect">schema/schema-sourceselect.json</file>
-        <file alias="schema-config">schema/schema-config.json</file>
-        <file alias="schema-componentstate">schema/schema-componentstate.json</file>
-        <file alias="schema-ledcolors">schema/schema-ledcolors.json</file>
-        <file alias="schema-logging">schema/schema-logging.json</file>
-        <file alias="schema-processing">schema/schema-processing.json</file>
-    </qresource>
-</RCC>

libsrc/jsonserver/JsonServer.cpp

@@ -36,9 +36,6 @@ JsonServer::JsonServer(uint16_t port)
 	// Set trigger for incoming connections
 	connect(&_server, SIGNAL(newConnection()), this, SLOT(newConnection()));
 
-	// make sure the resources are loaded (they may be left out after static linking
-	Q_INIT_RESOURCE(JsonSchemas);
-
 	// receive state of forwarder
 	connect(_hyperion, &Hyperion::componentStateChanged, this, &JsonServer::componentStateChanged);
 

libsrc/kodivideochecker/CMakeLists.txt

@@ -3,24 +3,17 @@
 SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/kodivideochecker)
 SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/kodivideochecker)
 
-# Group the headers that go through the MOC compiler
-SET(KODIVideoChecker_QT_HEADERS
-	${CURRENT_HEADER_DIR}/KODIVideoChecker.h
-)
-
 SET(KODIVideoChecker_HEADERS
+	${CURRENT_HEADER_DIR}/KODIVideoChecker.h
 )
 
 SET(KODIVideoChecker_SOURCES
 	${CURRENT_SOURCE_DIR}/KODIVideoChecker.cpp
 )
 
-QT5_WRAP_CPP(KODIVideoChecker_HEADERS_MOC ${KODIVideoChecker_QT_HEADERS})
 
 add_library(kodivideochecker
 	${KODIVideoChecker_HEADERS}
-	${KODIVideoChecker_QT_HEADERS}
-	${KODIVideoChecker_HEADERS_MOC}
 	${KODIVideoChecker_SOURCES}
 )
 

libsrc/leddevice/CMakeLists.txt

@@ -7,23 +7,14 @@ SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/leddevice)
 find_package(libusb-1.0 REQUIRED)
 #find_package(Threads REQUIRED)
 
+# qt files
+find_package(Qt5 COMPONENTS Network SerialPort REQUIRED)
+
 include_directories(
 	${CMAKE_SOURCE_DIR}/include/hidapi
 	${LIBUSB_1_INCLUDE_DIRS}
 ) # for Lightpack device
 
-# Group the headers that go through the MOC compiler
-SET(Leddevice_QT_HEADERS
-	${CURRENT_HEADER_DIR}/LedDevice.h
-	${CURRENT_SOURCE_DIR}/ProviderRs232.h
-	${CURRENT_SOURCE_DIR}/LedDeviceAdalight.h
-	${CURRENT_SOURCE_DIR}/LedDeviceAtmoOrb.h
-	${CURRENT_SOURCE_DIR}/LedDevicePhilipsHue.h
-	${CURRENT_SOURCE_DIR}/ProviderHID.h
-	${CURRENT_SOURCE_DIR}/LedDeviceRawHID.h
-	${CURRENT_SOURCE_DIR}/LedDeviceFadeCandy.h
-)
-
 SET(Leddevice_HEADERS
 	${CURRENT_HEADER_DIR}/LedDeviceFactory.h
 
@@ -43,6 +34,14 @@ SET(Leddevice_HEADERS
 	${CURRENT_SOURCE_DIR}/LedDeviceTpm2.h
 	${CURRENT_SOURCE_DIR}/LedDeviceTpm2net.h
 	${CURRENT_SOURCE_DIR}/LedDeviceAtmo.h
+	${CURRENT_HEADER_DIR}/LedDevice.h
+	${CURRENT_SOURCE_DIR}/ProviderRs232.h
+	${CURRENT_SOURCE_DIR}/LedDeviceAdalight.h
+	${CURRENT_SOURCE_DIR}/LedDeviceAtmoOrb.h
+	${CURRENT_SOURCE_DIR}/LedDevicePhilipsHue.h
+	${CURRENT_SOURCE_DIR}/ProviderHID.h
+	${CURRENT_SOURCE_DIR}/LedDeviceRawHID.h
+	${CURRENT_SOURCE_DIR}/LedDeviceFadeCandy.h
 )
 
 SET(Leddevice_SOURCES
@@ -129,27 +128,21 @@ set(LedDevice_RESOURCES
 	${CURRENT_SOURCE_DIR}/LedDeviceSchemas.qrc
 )
 
-QT5_WRAP_CPP(Leddevice_HEADERS_MOC ${Leddevice_QT_HEADERS})
 qt5_add_resources(LedDevice_RESOURCES_RCC ${LedDevice_RESOURCES} OPTIONS "-no-compress")
 
-
-
 add_library(leddevice
 	${Leddevice_HEADERS}
-	${Leddevice_QT_HEADERS}
-	${Leddevice_HEADERS_MOC}
 	${Leddevice_SOURCES}
 	${LedDevice_RESOURCES}
 	${LedDevice_RESOURCES_RCC}
 )
 
-qt5_use_modules(leddevice Network SerialPort)
-
 target_link_libraries(leddevice
 	hyperion-utils
 	${LIBUSB_1_LIBRARIES} #apt-get install libusb-1.0-0-dev
 	${CMAKE_THREAD_LIBS_INIT}
-	${QT_LIBRARIES}
+	Qt5::Network
+	Qt5::SerialPort
 )
 
 if(ENABLE_TINKERFORGE)

libsrc/protoserver/CMakeLists.txt

@@ -8,17 +8,13 @@ include_directories(
 	${PROTOBUF_INCLUDE_DIRS}
 )
 
-# Group the headers that go through the MOC compiler
-set(ProtoServer_QT_HEADERS
+set(ProtoServer_HEADERS
 	${CURRENT_HEADER_DIR}/ProtoServer.h
 	${CURRENT_HEADER_DIR}/ProtoConnection.h
 	${CURRENT_SOURCE_DIR}/ProtoClientConnection.h
 	${CURRENT_HEADER_DIR}/ProtoConnectionWrapper.h
 )
 
-set(ProtoServer_HEADERS
-)
-
 set(ProtoServer_SOURCES
 	${CURRENT_SOURCE_DIR}/ProtoServer.cpp
 	${CURRENT_SOURCE_DIR}/ProtoClientConnection.cpp
@@ -34,23 +30,17 @@ protobuf_generate_cpp(ProtoServer_PROTO_SRCS ProtoServer_PROTO_HDRS
 	${ProtoServer_PROTOS}
 )
 
-qt5_wrap_cpp(ProtoServer_HEADERS_MOC ${ProtoServer_QT_HEADERS})
-
 add_library(protoserver
 	${ProtoServer_HEADERS}
-	${ProtoServer_QT_HEADERS}
 	${ProtoServer_SOURCES}
-	${ProtoServer_HEADERS_MOC}
 	${ProtoServer_PROTOS}
 	${ProtoServer_PROTO_SRCS}
 	${ProtoServer_PROTO_HDRS}
 )
 
-qt5_use_modules(protoserver Gui)
-
 target_link_libraries(protoserver
 	hyperion
 	hyperion-utils
 	protobuf
-	${QT_LIBRARIES}
+	Qt5::Gui
 )

libsrc/udplistener/CMakeLists.txt

@@ -3,25 +3,17 @@
 set(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/udplistener)
 set(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/udplistener)
 
-# Group the headers that go through the MOC compiler
-set(UDPListener_QT_HEADERS
-	${CURRENT_HEADER_DIR}/UDPListener.h
-)
-
 set(UDPListener_HEADERS
+	${CURRENT_HEADER_DIR}/UDPListener.h
 )
 
 set(UDPListener_SOURCES
 	${CURRENT_SOURCE_DIR}/UDPListener.cpp
 )
 
-qt5_wrap_cpp(UDPListener_HEADERS_MOC ${UDPListener_QT_HEADERS})
-
 add_library(udplistener
 	${UDPListener_HEADERS}
-	${UDPListener_QT_HEADERS}
 	${UDPListener_SOURCES}
-	${UDPListener_HEADERS_MOC}
 )
 
 target_link_libraries(udplistener

libsrc/utils/CMakeLists.txt

@@ -3,12 +3,6 @@
 SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/utils)
 SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/utils)
 
-SET(Utils_QT_HEADERS
-	${CURRENT_HEADER_DIR}/Logger.h
-	${CURRENT_HEADER_DIR}/Stats.h
-	${CURRENT_HEADER_DIR}/JsonProcessor.h
-)
-
 SET(Utils_HEADERS
 	${CURRENT_HEADER_DIR}/ColorBgr.h
 	${CURRENT_HEADER_DIR}/ColorRgb.h
@@ -30,6 +24,9 @@ SET(Utils_HEADERS
 	${CURRENT_HEADER_DIR}/jsonschema/QJsonUtils.h
 	${CURRENT_HEADER_DIR}/global_defines.h
 	${CURRENT_HEADER_DIR}/SysInfo.h
+	${CURRENT_HEADER_DIR}/Logger.h
+	${CURRENT_HEADER_DIR}/Stats.h
+	${CURRENT_HEADER_DIR}/JsonProcessor.h
 )
 
 SET(Utils_SOURCES
@@ -56,18 +53,24 @@ if ( ENABLE_PROFILER )
 	SET ( PROFILER_SOURCE ${CURRENT_HEADER_DIR}/Profiler.h ${CURRENT_SOURCE_DIR}/Profiler.cpp )
 endif()
 
-qt5_wrap_cpp(Utils_HEADERS_MOC ${Utils_QT_HEADERS})
+set(Utils_RESOURCES
+	${CURRENT_SOURCE_DIR}/JSONRPC_schemas.qrc
+)
+
+qt5_add_resources(Utils_RESOURCES_RCC ${Utils_RESOURCES} OPTIONS "-no-compress")
 
 
 add_library(hyperion-utils
-	${Utils_QT_HEADERS}
-	${Utils_HEADERS_MOC}
 	${Utils_HEADERS}
 	${Utils_SOURCES}
 	${PROFILER_SOURCE}
+	${Utils_RESOURCES}
+	${Utils_RESOURCES_RCC}
 )
 
-qt5_use_modules(hyperion-utils Core Gui Network)
-
 target_link_libraries(hyperion-utils
-	${QT_LIBRARIES})
+	hyperion
+	Qt5::Core
+	Qt5::Gui
+	Qt5::Network
+)

libsrc/utils/JSONRPC_schemas.qrc

@@ -0,0 +1,21 @@
+<RCC>
+    <qresource prefix="/">
+        <file alias="schema">JSONRPC_schema/schema.json</file>
+        <file alias="schema-color">JSONRPC_schema/schema-color.json</file>
+        <file alias="schema-image">JSONRPC_schema/schema-image.json</file>
+        <file alias="schema-serverinfo">JSONRPC_schema/schema-serverinfo.json</file>
+        <file alias="schema-sysinfo">JSONRPC_schema/schema-sysinfo.json</file>
+        <file alias="schema-clear">JSONRPC_schema/schema-clear.json</file>
+        <file alias="schema-clearall">JSONRPC_schema/schema-clearall.json</file>
+        <file alias="schema-adjustment">JSONRPC_schema/schema-adjustment.json</file>
+        <file alias="schema-effect">JSONRPC_schema/schema-effect.json</file>
+        <file alias="schema-create-effect">JSONRPC_schema/schema-create-effect.json</file>
+        <file alias="schema-delete-effect">JSONRPC_schema/schema-delete-effect.json</file>
+        <file alias="schema-sourceselect">JSONRPC_schema/schema-sourceselect.json</file>
+        <file alias="schema-config">JSONRPC_schema/schema-config.json</file>
+        <file alias="schema-componentstate">JSONRPC_schema/schema-componentstate.json</file>
+        <file alias="schema-ledcolors">JSONRPC_schema/schema-ledcolors.json</file>
+        <file alias="schema-logging">JSONRPC_schema/schema-logging.json</file>
+        <file alias="schema-processing">JSONRPC_schema/schema-processing.json</file>
+    </qresource>
+</RCC>

libsrc/utils/JsonProcessor.cpp

@@ -1077,7 +1077,7 @@ void JsonProcessor::sendErrorReply(const QString &error, const QString &command,
 bool JsonProcessor::checkJson(const QJsonObject& message, const QString& schemaResource, QString& errorMessage, bool ignoreRequired)
 {
 	// make sure the resources are loaded (they may be left out after static linking)
-	Q_INIT_RESOURCE(JsonSchemas);
+	Q_INIT_RESOURCE(JSONRPC_schemas);
 	QJsonParseError error;
 
 	// read the json schema from the resource

libsrc/webconfig/CMakeLists.txt

@@ -3,8 +3,7 @@
 set(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/webconfig)
 set(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/webconfig)
 
-# Group the headers that go through the MOC compiler
-set(WebConfig_QT_HEADERS
+set(WebConfig_HEADERS
 	${CURRENT_SOURCE_DIR}/QtHttpClientWrapper.h
 	${CURRENT_SOURCE_DIR}/QtHttpReply.h
 	${CURRENT_SOURCE_DIR}/QtHttpRequest.h
@@ -14,9 +13,6 @@ set(WebConfig_QT_HEADERS
 	${CURRENT_HEADER_DIR}/WebConfig.h
 )
 
-set(WebConfig_HEADERS
-)
-
 set(WebConfig_SOURCES
 	${CURRENT_SOURCE_DIR}/QtHttpClientWrapper.cpp
 	${CURRENT_SOURCE_DIR}/QtHttpHeader.cpp
@@ -35,23 +31,16 @@ ENDFOREACH()
 CONFIGURE_FILE(${CURRENT_SOURCE_DIR}/WebConfig.qrc.in ${CMAKE_BINARY_DIR}/WebConfig.qrc )
 SET(WebConfig_RESOURCES ${CMAKE_BINARY_DIR}/WebConfig.qrc)
 
-qt5_wrap_cpp(WebConfig_HEADERS_MOC ${WebConfig_QT_HEADERS})
 qt5_add_resources(WebConfig_RESOURCES_RCC ${WebConfig_RESOURCES} ) #OPTIONS "-no-compress"
 
 add_library(webconfig
 	${WebConfig_HEADERS}
-	${WebConfig_QT_HEADERS}
 	${WebConfig_SOURCES}
-	${WebConfig_HEADERS_MOC}
 	${WebConfig_RESOURCES_RCC}
 )
 
-qt5_use_modules(webconfig Network)
-
 target_link_libraries(webconfig
 	hyperion
 	hyperion-utils
-	${QT_LIBRARIES}
+	Qt5::Network
 )
-
-