cmake: clean up unreferenced globs

1 files changed, 30 insertions, 31 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa551885..2033a597 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,8 +189,7 @@ macro(opentrack_module n dir)
     QT5_ADD_RESOURCES(${n}-rcc ${${n}-rc})
 endmacro()
 
-file(GLOB opentrack-lib-c "opentrack-api/*.cpp" "facetracknoir/global-settings.cpp")
-file(GLOB opentrack-lib-h "opentrack-api/*.h" "facetracknoir/global-settings.h")
+file(GLOB opentrack-lib-c "opentrack-api/*.cpp" "facetracknoir/global-settings.cpp" "opentrack-api/*.h" "facetracknoir/global-settings.h")
 
 opentrack_module(opentrack-bin facetracknoir)
 opentrack_module(opentrack-pose-widget ftnoir_posewidget)
@@ -225,11 +224,11 @@ opentrack_module(opentrack-tracker-rift ftnoir_tracker_rift)
 opentrack_module(opentrack-tracker-hydra ftnoir_tracker_hydra)
 opentrack_module(opentrack-tracker-hatire ftnoir_tracker_hatire)
 
-file(GLOB opentrack-csv-c "ftnoir_csv/*.cpp")
+file(GLOB opentrack-csv-c "ftnoir_csv/*.cpp" "ftnoir_csv/*.h")
 
 # compat lib for POSIX/win32
 
-file(GLOB opentrack-compat-c "compat/*.cpp")
+file(GLOB opentrack-compat-c "compat/*.cpp" "compat/*.h")
 
 # x-plane plugin
 file(GLOB opentrack-xplane-plugin-c "x-plane-plugin/*.c")
@@ -271,7 +270,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
     SET (CMAKE_MODULE_LINKER_FLAGS ${CMAKE_MODULE_LINKER_FLAGS_INIT} -rdynamic CACHE STRING "Flags used by the linker during the creation of modules.")
 endif()
 
-add_library(opentrack-compat SHARED ${opentrack-compat-c} ${opentrack-compat-h})
+add_library(opentrack-compat SHARED ${opentrack-compat-c})
 if(NOT WIN32 AND NOT APPLE)
     target_link_libraries(opentrack-compat rt)
 endif()
@@ -298,18 +297,18 @@ else()
         ${Qt5Network_LIBRARIES} ${Qt5Xml_LIBRARIES} ${Qt5Core_LIBRARIES} ${maybe-hatire} ${my-qt-deps})
 endif()
 
-add_library(opentrack-csv SHARED ${opentrack-csv-c} ${opentrack-csv-h})
+add_library(opentrack-csv SHARED ${opentrack-csv-c})
 target_link_libraries(opentrack-csv ${MY_QT_LIBS})
 
-add_library(opentrack-pose-widget SHARED ${opentrack-pose-widget-c} ${opentrack-pose-widget-h} ${opentrack-pose-widget-moc} ${opentrack-pose-widget-rcc})
+add_library(opentrack-pose-widget SHARED ${opentrack-pose-widget-c} ${opentrack-pose-widget-rcc})
 target_link_libraries(opentrack-pose-widget ${MY_QT_LIBS})
-add_library(opentrack-spline-widget SHARED ${opentrack-spline-widget-c} ${opentrack-spline-widget-h} ${opentrack-spline-widget-moc})
+add_library(opentrack-spline-widget SHARED ${opentrack-spline-widget-c})
 target_link_libraries(opentrack-spline-widget ${MY_QT_LIBS})
 
-add_library(opentrack-filter-accela SHARED ${opentrack-filter-accela-c} ${opentrack-filter-accela-h} ${opentrack-filter-accela-moc} ${opentrack-filter-accela-uih} ${opentrack-filter-accela-rcc})
+add_library(opentrack-filter-accela SHARED ${opentrack-filter-accela-c} ${opentrack-filter-accela-uih} ${opentrack-filter-accela-rcc})
 target_link_libraries(opentrack-filter-accela ${MY_QT_LIBS})
 
-add_library(opentrack-filter-kalman SHARED ${opentrack-filter-kalman-c} ${opentrack-filter-kalman-h} ${opentrack-filter-kalman-moc} ${opentrack-filter-kalman-uih} ${opentrack-filter-kalman-rcc})
+add_library(opentrack-filter-kalman SHARED ${opentrack-filter-kalman-c} ${opentrack-filter-kalman-uih} ${opentrack-filter-kalman-rcc})
 target_link_libraries(opentrack-filter-kalman ${MY_QT_LIBS} ${OpenCV_LIBS})
 
 if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
@@ -322,7 +321,7 @@ if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
     PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/facetracknoir/${version-script}-version-script.txt")
 endif()
 
-add_library(opentrack-filter-ewma SHARED ${opentrack-filter-ewma-uih} ${opentrack-filter-ewma-c} ${opentrack-filter-ewma-h} ${opentrack-filter-ewma-moc} ${opentrack-filter-ewma-rcc})
+add_library(opentrack-filter-ewma SHARED ${opentrack-filter-ewma-uih} ${opentrack-filter-ewma-c} ${opentrack-filter-ewma-rcc})
 target_link_libraries(opentrack-filter-ewma ${MY_QT_LIBS})
 
 if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
@@ -330,7 +329,7 @@ if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
                   PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/facetracknoir/${version-script}-version-script.txt")
 endif()
 
-add_library(opentrack-proto-fgfs SHARED ${opentrack-proto-fgfs-c} ${opentrack-proto-fgfs-h} ${opentrack-proto-fgfs-moc} ${opentrack-proto-fgfs-uih} ${opentrack-proto-fgfs-rcc})
+add_library(opentrack-proto-fgfs SHARED ${opentrack-proto-fgfs-c} ${opentrack-proto-fgfs-uih} ${opentrack-proto-fgfs-rcc})
 target_link_libraries(opentrack-proto-fgfs ${MY_QT_LIBS})
 if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
     SET_TARGET_PROPERTIES(opentrack-proto-fgfs
@@ -339,7 +338,7 @@ endif()
 
 if(WIN32 AND SDK_VJOY)
     include_directories(${SDK_VJOY})
-    add_library(opentrack-proto-vjoy SHARED ${opentrack-proto-vjoy-c} ${opentrack-proto-vjoy-h} ${opentrack-proto-vjoy-moc} ${opentrack-proto-vjoy-uih} ${opentrack-proto-vjoy-rcc})
+    add_library(opentrack-proto-vjoy SHARED ${opentrack-proto-vjoy-c} ${opentrack-proto-vjoy-uih} ${opentrack-proto-vjoy-rcc})
     if(MSVC)
         target_link_libraries(opentrack-proto-vjoy ${MY_QT_LIBS} "${SDK_VJOY}/VJoy.lib")
     else()
@@ -352,7 +351,7 @@ if(WIN32 AND SDK_VJOY)
 endif()
 
 if(UNIX AND SDK_ENABLE_LIBEVDEV)
-    add_library(opentrack-proto-libevdev SHARED ${opentrack-proto-libevdev-c} ${opentrack-proto-libevdev-h} ${opentrack-proto-libevdev-moc} ${opentrack-proto-libevdev-uih} ${opentrack-proto-libevdev-rcc})
+    add_library(opentrack-proto-libevdev SHARED ${opentrack-proto-libevdev-c} ${opentrack-proto-libevdev-uih} ${opentrack-proto-libevdev-rcc})
     target_link_libraries(opentrack-proto-libevdev ${MY_QT_LIBS} evdev)
     if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
         SET_TARGET_PROPERTIES(opentrack-proto-libevdev
@@ -363,7 +362,7 @@ endif()
 
 if(WIN32)
     if(SDK_FSUIPC)
-        add_library(opentrack-proto-fsuipc SHARED ${opentrack-proto-fsuipc-c} ${opentrack-proto-fsuipc-h} ${opentrack-proto-fsuipc-moc} ${opentrack-proto-fsuipc-uih} ${opentrack-proto-fsuipc-rcc})
+        add_library(opentrack-proto-fsuipc SHARED ${opentrack-proto-fsuipc-c} ${opentrack-proto-fsuipc-uih} ${opentrack-proto-fsuipc-rcc})
         target_link_libraries(opentrack-proto-fsuipc ${MY_QT_LIBS} "${SDK_FSUIPC}/FSUIPC_User.lib")
         if(MSVC)
                 set_target_properties(opentrack-proto-fsuipc PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libc")
@@ -373,24 +372,24 @@ if(WIN32)
     endif()
 
     if(SDK_SIMCONNECT)
-        add_library(opentrack-proto-simconnect SHARED ${opentrack-proto-simconnect-c} ${opentrack-proto-simconnect-h} ${opentrack-proto-simconnect-moc} ${opentrack-proto-simconnect-uih} ${opentrack-proto-simconnect-rcc})
+        add_library(opentrack-proto-simconnect SHARED ${opentrack-proto-simconnect-c} ${opentrack-proto-simconnect-uih} ${opentrack-proto-simconnect-rcc})
         target_link_libraries(opentrack-proto-simconnect ${MY_QT_LIBS})
         include_directories("${SDK_SIMCONNECT}/inc")
         target_link_libraries(opentrack-proto-simconnect "${SDK_SIMCONNECT}/lib/SimConnect.lib")
     endif()
 
-    add_library(opentrack-proto-freetrack SHARED ${opentrack-proto-freetrack-c} ${opentrack-proto-freetrack-h} ${opentrack-proto-freetrack-moc} ${opentrack-proto-freetrack-uih} ${opentrack-proto-freetrack-rcc})
+    add_library(opentrack-proto-freetrack SHARED ${opentrack-proto-freetrack-c} ${opentrack-proto-freetrack-uih} ${opentrack-proto-freetrack-rcc})
     target_link_libraries(opentrack-proto-freetrack opentrack-csv ${MY_QT_LIBS} opentrack-compat)
 
-    add_library(opentrack-proto-win32-mouse SHARED ${opentrack-proto-win32-mouse-c} ${opentrack-proto-win32-mouse-h} ${opentrack-proto-win32-mouse-moc} ${opentrack-proto-win32-mouse-uih} ${opentrack-proto-win32-mouse-rcc})
+    add_library(opentrack-proto-win32-mouse SHARED ${opentrack-proto-win32-mouse-c} ${opentrack-proto-win32-mouse-uih} ${opentrack-proto-win32-mouse-rcc})
     target_link_libraries(opentrack-proto-win32-mouse ${MY_QT_LIBS})
-    add_library(freetrackclient SHARED ${opentrack-freetrack-c} ${opentrack-freetrack-h})
+    add_library(freetrackclient SHARED ${opentrack-freetrack-c})
     if(CMAKE_COMPILER_IS_GNUCC)
         set_target_properties(freetrackclient PROPERTIES LINK_FLAGS "-Wl,--enable-stdcall-fixup -fno-lto -Wl,-kill-at" PREFIX "" COMPILE_FLAGS "-fno-lto")
     endif()
 endif()
 
-add_library(opentrack-proto-udp SHARED ${opentrack-proto-udp-c} ${opentrack-proto-udp-h} ${opentrack-proto-udp-moc} ${opentrack-proto-udp-uih} ${opentrack-proto-udp-rcc})
+add_library(opentrack-proto-udp SHARED ${opentrack-proto-udp-c} ${opentrack-proto-udp-uih} ${opentrack-proto-udp-rcc})
 target_link_libraries(opentrack-proto-udp ${MY_QT_LIBS})
 if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
     SET_TARGET_PROPERTIES(opentrack-proto-udp
@@ -398,7 +397,7 @@ if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
 endif()
 
 if(WIN32)
-    add_library(opentrack-tracker-joystick SHARED ${opentrack-tracker-joystick-c} ${opentrack-tracker-joystick-h} ${opentrack-tracker-joystick-moc} ${opentrack-tracker-joystick-uih} ${opentrack-tracker-joystick-rcc})
+    add_library(opentrack-tracker-joystick SHARED ${opentrack-tracker-joystick-c} ${opentrack-tracker-joystick-uih} ${opentrack-tracker-joystick-rcc})
     target_link_libraries(opentrack-tracker-joystick ${MY_QT_LIBS})
     if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
         SET_TARGET_PROPERTIES(opentrack-tracker-joystick
@@ -407,7 +406,7 @@ if(WIN32)
 endif()
 
 if(NOT WIN32 AND SDK_WINE_PREFIX)
-    add_library(opentrack-proto-wine SHARED ${opentrack-proto-wine-c} ${opentrack-proto-wine-h} ${opentrack-proto-wine-moc} ${opentrack-proto-wine-uih} ${opentrack-proto-wine-rcc})
+    add_library(opentrack-proto-wine SHARED ${opentrack-proto-wine-c} ${opentrack-proto-wine-uih} ${opentrack-proto-wine-rcc})
     target_link_libraries(opentrack-proto-wine ${MY_QT_LIBS} opentrack-compat opentrack-csv)
     if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
         SET_TARGET_PROPERTIES(opentrack-proto-wine
@@ -439,7 +438,7 @@ if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
                   PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/facetracknoir/${version-script}-version-script.txt")
 endif()
 
-add_library(opentrack-tracker-ht SHARED ${opentrack-tracker-ht-c} ${opentrack-tracker-ht-h} ${opentrack-tracker-ht-moc} ${opentrack-tracker-ht-uih} ${opentrack-tracker-ht-rcc})
+add_library(opentrack-tracker-ht SHARED ${opentrack-tracker-ht-c} ${opentrack-tracker-ht-uih} ${opentrack-tracker-ht-rcc})
 target_link_libraries(opentrack-tracker-ht ${MY_QT_LIBS} opentrack-compat)
 if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
     SET_TARGET_PROPERTIES(opentrack-tracker-ht
@@ -448,7 +447,7 @@ endif()
 
 if(SDK_ARUCO_LIBPATH)
     include_directories(${CMAKE_SOURCE_DIR}/ftnoir_tracker_aruco/include)
-    add_library(opentrack-tracker-aruco SHARED ${opentrack-tracker-aruco-c} ${opentrack-tracker-aruco-h} ${opentrack-tracker-aruco-moc} ${opentrack-tracker-aruco-uih} ${opentrack-tracker-aruco-rcc})
+    add_library(opentrack-tracker-aruco SHARED ${opentrack-tracker-aruco-c} ${opentrack-tracker-aruco-uih} ${opentrack-tracker-aruco-rcc})
     target_link_libraries(opentrack-tracker-aruco ${MY_QT_LIBS} ${SDK_ARUCO_LIBPATH} ${OpenCV_LIBS})
     if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
         SET_TARGET_PROPERTIES(opentrack-tracker-aruco
@@ -463,7 +462,7 @@ if(SDK_ARUCO_LIBPATH)
 endif()
 
 if(SDK_HATIRE)
-    add_library(opentrack-tracker-hatire SHARED ${opentrack-tracker-hatire-c} ${opentrack-tracker-hatire-h} ${opentrack-tracker-hatire-moc} ${opentrack-tracker-hatire-uih} ${opentrack-tracker-hatire-rcc})
+    add_library(opentrack-tracker-hatire SHARED ${opentrack-tracker-hatire-c} ${opentrack-tracker-hatire-uih} ${opentrack-tracker-hatire-rcc})
     target_link_libraries(opentrack-tracker-hatire ${MY_QT_LIBS})
     install(TARGETS opentrack-tracker-hatire RUNTIME DESTINATION . LIBRARY DESTINATION .  )
     if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
@@ -484,7 +483,7 @@ if(WIN32)
                   uuid)
 endif()
 
-add_library(opentrack-tracker-pt SHARED ${opentrack-tracker-pt-c} ${opentrack-tracker-pt-h} ${opentrack-tracker-pt-moc} ${opentrack-tracker-pt-uih} ${opentrack-tracker-pt-rcc})
+add_library(opentrack-tracker-pt SHARED ${opentrack-tracker-pt-c} ${opentrack-tracker-pt-uih} ${opentrack-tracker-pt-rcc})
 target_link_libraries(opentrack-tracker-pt ${MY_QT_LIBS} ${OpenCV_LIBS})
 
 if(APPLE)
@@ -504,7 +503,7 @@ if(WIN32)
                   uuid)
 endif()
 
-add_library(opentrack-tracker-udp SHARED ${opentrack-tracker-udp-c} ${opentrack-tracker-udp-h} ${opentrack-tracker-udp-moc} ${opentrack-tracker-udp-uih} ${opentrack-tracker-udp-rcc})
+add_library(opentrack-tracker-udp SHARED ${opentrack-tracker-udp-c} ${opentrack-tracker-udp-uih} ${opentrack-tracker-udp-rcc})
 target_link_libraries(opentrack-tracker-udp ${MY_QT_LIBS})
 if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
     SET_TARGET_PROPERTIES(opentrack-tracker-udp
@@ -514,7 +513,7 @@ endif()
 if(SDK_RIFT)
     include_directories("${SDK_RIFT}/Include")
     include_directories("${SDK_RIFT}/Src")
-    add_library(opentrack-tracker-rift SHARED ${opentrack-tracker-rift-c} ${opentrack-tracker-rift-h} ${opentrack-tracker-rift-moc} ${opentrack-tracker-rift-uih} ${opentrack-tracker-rift-rcc})
+    add_library(opentrack-tracker-rift SHARED ${opentrack-tracker-rift-c} ${opentrack-tracker-rift-uih} ${opentrack-tracker-rift-rcc})
     target_link_libraries(opentrack-tracker-rift ${MY_QT_LIBS})
             if(MSVC)
                     target_link_libraries(opentrack-tracker-rift "${SDK_RIFT}/Lib/Win32/libovr.lib" winmm.lib setupapi.lib)
@@ -546,7 +545,7 @@ if(SDK_RIFT)
 if(SDK_HYDRA)
     include_directories("${SDK_HYDRA}/include")
     include_directories("${SDK_HYDRA}/include/sixense_utils")
-    add_library(opentrack-tracker-hydra SHARED ${opentrack-tracker-hydra-c} ${opentrack-tracker-hydra-h} ${opentrack-tracker-hydra-moc} ${opentrack-tracker-hydra-uih} ${opentrack-tracker-hydra-rcc})
+    add_library(opentrack-tracker-hydra SHARED ${opentrack-tracker-hydra-c} ${opentrack-tracker-hydra-uih} ${opentrack-tracker-hydra-rcc})
     target_link_libraries(opentrack-tracker-hydra ${MY_QT_LIBS})
     if(WIN32)
         target_link_libraries(opentrack-tracker-hydra
@@ -594,7 +593,7 @@ if(UNIX OR APPLE)
 	    target_link_libraries(opentrack-qxt-mini X11)
     endif()
 endif()
-add_executable(opentrack ${opentrack-win32-executable} ${opentrack-bin-c} ${opentrack-bin-h} ${opentrack-bin-moc} ${opentrack-bin-uih} ${opentrack-bin-rcc})
+add_executable(opentrack ${opentrack-win32-executable} ${opentrack-bin-c} ${opentrack-bin-uih} ${opentrack-bin-rcc})
 set_target_properties(opentrack PROPERTIES COMPILE_DEFINITIONS OPENTRACK_VERSION=\"${OPENTRACK__COMMIT}\")
 set(OPENTRACK_COMMIT_VERSION \"${OPENTRACK__COMMIT}\")
 configure_file("${CMAKE_SOURCE_DIR}/opentrack-version.h" "${CMAKE_BINARY_DIR}/opentrack-version.h" @ONLY NEWLINE_STYLE UNIX)
@@ -603,7 +602,7 @@ if(APPLE)
     SET_TARGET_PROPERTIES(opentrack-qxt-mini PROPERTIES LINK_FLAGS "-framework Carbon -framework CoreFoundation")
 endif()
 
-add_library(opentrack-api SHARED ${opentrack-lib-c} ${opentrack-lib-h} ${opentrack-lib-moc})
+add_library(opentrack-api SHARED ${opentrack-lib-c})
 target_link_libraries(opentrack-api ${MY_QT_LIBS})
 if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
     SET_TARGET_PROPERTIES(opentrack-api PROPERTIES