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/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}
 )