Refactor/Create APT/DNF Repository (#1648)

libsrc/grabber/x11/CMakeLists.txt

@@ -1,24 +1,23 @@
-# Define the current source locations
-SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/grabber)
-SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/grabber/x11)
-
-# Find X11
 find_package(X11 REQUIRED)
 
-include_directories( ${X11_INCLUDES} )
-
-if(APPLE)
-	include_directories("/opt/X11/include")
-endif(APPLE)
-
-FILE ( GLOB X11_SOURCES "${CURRENT_HEADER_DIR}/X11*.h"  "${CURRENT_SOURCE_DIR}/*.h"  "${CURRENT_SOURCE_DIR}/*.cpp" )
-
-add_library(x11-grabber ${X11_SOURCES} )
+add_library(x11-grabber
+	${CMAKE_SOURCE_DIR}/include/grabber/x11/X11Grabber.h
+	${CMAKE_SOURCE_DIR}/include/grabber/x11/X11Wrapper.h
+	${CMAKE_SOURCE_DIR}/libsrc/grabber/x11/X11Grabber.cpp
+	${CMAKE_SOURCE_DIR}/libsrc/grabber/x11/X11Wrapper.cpp
+)
 
 target_link_libraries(x11-grabber
 	hyperion
 	${X11_LIBRARIES}
 	${X11_Xrandr_LIB}
 	${X11_Xrender_LIB}
-	${QT_LIBRARIES}
+)
+
+if(APPLE)
+	list(APPEND X11_INCLUDES "/opt/X11/include")
+endif()
+
+target_include_directories(x11-grabber PUBLIC
+	${X11_INCLUDES}
 )

libsrc/grabber/x11/X11Grabber.cpp

@@ -1,5 +1,5 @@
 #include <utils/Logger.h>
-#include <grabber/X11Grabber.h>
+#include <grabber/x11/X11Grabber.h>
 
 #include <xcb/randr.h>
 #include <xcb/xcb_event.h>

libsrc/grabber/x11/X11Wrapper.cpp

@@ -1,4 +1,4 @@
-#include <grabber/X11Wrapper.h>
+#include <grabber/x11/X11Wrapper.h>
 
 X11Wrapper::X11Wrapper( int updateRate_Hz,
 						int pixelDecimation,