More on cmake build

ea4k · ea4k · commit 107d4df076d3 · 2025-08-19T18:28:19.000+02:00
diff --git a/src/callsign.h b/src/callsign.h
@@ -103,10 +103,6 @@ class Callsign : public QObject
 
     bool valid;         // The entered string is a correct callsign
     bool prefValid;     // The entered string is a correct prefix
-
-
-
-
 };
 
 #endif // CALLSIGN_H
diff --git a/tests/tst_adif/CMakeLists.txt b/tests/tst_adif/CMakeLists.txt
@@ -25,9 +25,6 @@ add_executable(tst_adif
     ../../src/klogdefinitions.h
 )
 
-# Enable MOC for Qt signals/slots if needed
-set(CMAKE_AUTOMOC ON)
-
 # Link with Qt6 Core and Test
 target_link_libraries(tst_adif
     Qt6::Core
diff --git a/tests/tst_callsign/CMakeLists.txt b/tests/tst_callsign/CMakeLists.txt
@@ -23,9 +23,6 @@ add_executable(tst_callsign
     ../../src/klogdefinitions.h
 )
 
-# Enable MOC for Qt signals/slots if needed
-set(CMAKE_AUTOMOC ON)
-
 # Link with Qt6 Core and Test
 target_link_libraries(tst_callsign
     Qt6::Core
diff --git a/tests/tst_database/CMakeLists.txt b/tests/tst_database/CMakeLists.txt
@@ -44,9 +44,6 @@ add_executable(tst_database
     ../../src/utilities.h
 )
 
-# Enable MOC for Qt signals/slots if needed
-set(CMAKE_AUTOMOC ON)
-
 # Link with Qt6 Core and Test
 target_link_libraries(tst_database
     Qt6::Core
diff --git a/tests/tst_dataproxy/CMakeLists.txt b/tests/tst_dataproxy/CMakeLists.txt
@@ -42,9 +42,6 @@ add_executable(tst_dataproxy
     ../../src/adif.h
 )
 
-# Enable MOC for Qt signals/slots if needed
-set(CMAKE_AUTOMOC ON)
-
 # Link with Qt6 Core and Test
 target_link_libraries(tst_dataproxy
     Qt6::Core
diff --git a/tests/tst_dxspot/CMakeLists.txt b/tests/tst_dxspot/CMakeLists.txt
@@ -11,6 +11,11 @@ set(CMAKE_AUTOMOC ON)
 
 # Collect test sources
 file(GLOB TEST_SOURCES "*.cpp")
+# Exclude any stale/generated files that might be in the source tree
+list(FILTER TEST_SOURCES EXCLUDE REGEX "/moc_.*\\.cpp$")
+list(FILTER TEST_SOURCES EXCLUDE REGEX "/ui_.*\\.cpp$")
+list(FILTER TEST_SOURCES EXCLUDE REGEX "/qrc_.*\\.cpp$")
+
 file(GLOB TEST_HEADERS "*.h")
 
 # Create the test executable
@@ -27,9 +32,6 @@ add_executable(tst_dxspot
     ../../src/klogdefinitions.h
 )
 
-# Enable MOC for Qt signals/slots if needed
-set(CMAKE_AUTOMOC ON)
-
 # Link with Qt6 Core and Test
 target_link_libraries(tst_dxspot
     Qt6::Core
diff --git a/tests/tst_filemanager/CMakeLists.txt b/tests/tst_filemanager/CMakeLists.txt
@@ -56,6 +56,7 @@ target_link_libraries(tst_filemanager
     Qt6::Core
     Qt6::Test
     Qt6::Sql
+    Qt6::Widgets
 )
 
 # Register the test with CTest
diff --git a/tests/tst_logwindow/CMakeLists.txt b/tests/tst_logwindow/CMakeLists.txt
@@ -60,6 +60,7 @@ target_link_libraries(tst_logwindow
     Qt6::Core
     Qt6::Test
     Qt6::Sql
+    Qt6::Widgets
 )
 
 # Register the test with CTest
diff --git a/tests/tst_main/CMakeLists.txt b/tests/tst_main/CMakeLists.txt
@@ -209,12 +209,14 @@ add_executable(tst_main
     ../../src/world.h
 )
 
-# Enable MOC for Qt signals/slots if needed
-set(CMAKE_AUTOMOC ON)
-
 # Link with Qt6 Core and Test
 target_link_libraries(tst_main
     Qt6::Core
+    Qt6::Charts
+    Qt6::Network
+    Qt6::PrintSupport
+    Qt6::Quick
+    Qt6::SerialPort
     Qt6::Test
     Qt6::Sql
     Qt6::Widgets
diff --git a/tests/tst_main/tst_main.cpp b/tests/tst_main/tst_main.cpp
@@ -65,3 +65,6 @@ private slots:
     }
 };
 
+QTEST_MAIN(tst_Main)
+#include "tst_main.moc"
+
diff --git a/tests/tst_mainqsoentrywidget/CMakeLists.txt b/tests/tst_mainqsoentrywidget/CMakeLists.txt
@@ -51,6 +51,7 @@ target_link_libraries(tst_mainqsoentrywidget
     Qt6::Core
     Qt6::Test
     Qt6::Sql
+    Qt6::Widgets
 )
 
 # Register the test with CTest
diff --git a/tests/tst_qso/CMakeLists.txt b/tests/tst_qso/CMakeLists.txt
@@ -40,14 +40,12 @@ add_executable(tst_qso
     ../../src/adif.h
 )
 
-# Enable MOC for Qt signals/slots if needed
-set(CMAKE_AUTOMOC ON)
-
 # Link with Qt6 Core and Test
 target_link_libraries(tst_qso
     Qt6::Core
     Qt6::Test
     Qt6::Sql
+    Qt6::Widgets
 )
 
 # Register the test with CTest
diff --git a/tests/tst_setuphamlibnetworkwidget/CMakeLists.txt b/tests/tst_setuphamlibnetworkwidget/CMakeLists.txt
@@ -23,13 +23,11 @@ add_executable(tst_setuphamlibnetworkwidget
     ../../src/setuppages/hamlibnetworkconfigwidget.h
 )
 
-# Enable MOC for Qt signals/slots if needed
-set(CMAKE_AUTOMOC ON)
-
 # Link with Qt6 Core and Test
 target_link_libraries(tst_setuphamlibnetworkwidget
     Qt6::Core
     Qt6::Test
+    Qt6::Widgets
 )
 
 # Register the test with CTest
diff --git a/tests/tst_setuphamlibserialwidget/CMakeLists.txt b/tests/tst_setuphamlibserialwidget/CMakeLists.txt
@@ -23,13 +23,12 @@ add_executable(tst_setuphamlibserialwidget
     ../../src/setuppages/hamlibserialconfigwidget.h
 )
 
-# Enable MOC for Qt signals/slots if needed
-set(CMAKE_AUTOMOC ON)
-
 # Link with Qt6 Core and Test
 target_link_libraries(tst_setuphamlibserialwidget
     Qt6::Core
+    Qt6::SerialPort
     Qt6::Test
+    Qt6::Widgets
 )
 
 # Register the test with CTest
diff --git a/tests/tst_setuppageelog/CMakeLists.txt b/tests/tst_setuppageelog/CMakeLists.txt
@@ -43,9 +43,6 @@ add_executable(tst_setuppageelog
     ../../src/adif.h
 )
 
-# Enable MOC for Qt signals/slots if needed
-set(CMAKE_AUTOMOC ON)
-
 # Link with Qt6 Core and Test
 target_link_libraries(tst_setuppageelog
     Qt6::Core
diff --git a/tests/tst_utilities/CMakeLists.txt b/tests/tst_utilities/CMakeLists.txt
@@ -41,14 +41,12 @@ add_executable(tst_utilities
     ../../src/adif.h
 )
 
-# Enable MOC for Qt signals/slots if needed
-set(CMAKE_AUTOMOC ON)
-
 # Link with Qt6 Core and Test
 target_link_libraries(tst_utilities
     Qt6::Core
     Qt6::Test
     Qt6::Sql
+    Qt6::Widgets
 )
 
 # Register the test with CTest
diff --git a/tests/tst_wizard/CMakeLists.txt b/tests/tst_wizard/CMakeLists.txt
@@ -32,13 +32,12 @@ add_executable(tst_wizard
     ../../src/startwizard.h
 )
 
-# Enable MOC for Qt signals/slots if needed
-set(CMAKE_AUTOMOC ON)
-
 # Link with Qt6 Core and Test
 target_link_libraries(tst_wizard
     Qt6::Core
+    Qt6::Network
     Qt6::Test
+    Qt6::Widgets
 )
 
 # Register the test with CTest
diff --git a/tests/tst_world/CMakeLists.txt b/tests/tst_world/CMakeLists.txt
@@ -42,9 +42,6 @@ add_executable(tst_world
     ../../src/adif.h
 )
 
-# Enable MOC for Qt signals/slots if needed
-set(CMAKE_AUTOMOC ON)
-
 # Link with Qt6 Core and Test
 target_link_libraries(tst_world
     Qt6::Core

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,6 @@ add_executable(tst_adif`
`25`	`25`	`../../src/klogdefinitions.h`
`26`	`26`	`)`
`27`	`27`
`28`		`-# Enable MOC for Qt signals/slots if needed`
`29`		`-set(CMAKE_AUTOMOC ON)`
`30`		`-`
`31`	`28`	`# Link with Qt6 Core and Test`
`32`	`29`	`target_link_libraries(tst_adif`
`33`	`30`	`Qt6::Core`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,6 @@ add_executable(tst_callsign`
`23`	`23`	`../../src/klogdefinitions.h`
`24`	`24`	`)`
`25`	`25`
`26`		`-# Enable MOC for Qt signals/slots if needed`
`27`		`-set(CMAKE_AUTOMOC ON)`
`28`		`-`
`29`	`26`	`# Link with Qt6 Core and Test`
`30`	`27`	`target_link_libraries(tst_callsign`
`31`	`28`	`Qt6::Core`
Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,6 @@ add_executable(tst_database`
`44`	`44`	`../../src/utilities.h`
`45`	`45`	`)`
`46`	`46`
`47`		`-# Enable MOC for Qt signals/slots if needed`
`48`		`-set(CMAKE_AUTOMOC ON)`
`49`		`-`
`50`	`47`	`# Link with Qt6 Core and Test`
`51`	`48`	`target_link_libraries(tst_database`
`52`	`49`	`Qt6::Core`
Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,6 @@ add_executable(tst_dataproxy`
`42`	`42`	`../../src/adif.h`
`43`	`43`	`)`
`44`	`44`
`45`		`-# Enable MOC for Qt signals/slots if needed`
`46`		`-set(CMAKE_AUTOMOC ON)`
`47`		`-`
`48`	`45`	`# Link with Qt6 Core and Test`
`49`	`46`	`target_link_libraries(tst_dataproxy`
`50`	`47`	`Qt6::Core`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ target_link_libraries(tst_filemanager`
`56`	`56`	`Qt6::Core`
`57`	`57`	`Qt6::Test`
`58`	`58`	`Qt6::Sql`
	`59`	`+ Qt6::Widgets`
`59`	`60`	`)`
`60`	`61`
`61`	`62`	`# Register the test with CTest`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ target_link_libraries(tst_logwindow`
`60`	`60`	`Qt6::Core`
`61`	`61`	`Qt6::Test`
`62`	`62`	`Qt6::Sql`
	`63`	`+ Qt6::Widgets`
`63`	`64`	`)`
`64`	`65`
`65`	`66`	`# Register the test with CTest`
Original file line number	Diff line number	Diff line change
`@@ -65,3 +65,6 @@ private slots:`
`65`	`65`	`}`
`66`	`66`	`};`
`67`	`67`
	`68`	`+QTEST_MAIN(tst_Main)`
	`69`	`+#include "tst_main.moc"`
	`70`	`+`