[libcalamares] Switch tests to calamares_add_test()

src/libcalamares/CMakeLists.txt

@@ -158,81 +158,48 @@ install( FILES ${utilsHeaders}                      DESTINATION include/libcalam
 ### TESTING
 #
 #
-if ( ECM_FOUND AND BUILD_TESTING )
+calamares_add_test(
-    ecm_add_test(
+    libcalamarestest
-            utils/Tests.cpp
+    SOURCES
-        TEST_NAME
+        utils/Tests.cpp
-            libcalamarestest
+)
-        LINK_LIBRARIES
-            calamares
-            Qt5::Core
-            Qt5::Test
-    )
-    calamares_automoc( libcalamarestest )
-
-    ecm_add_test(
-            utils/TestPaths.cpp
-        TEST_NAME
-            libcalamarestestpaths
-        LINK_LIBRARIES
-            calamares
-            Qt5::Core
-            Qt5::Test
-    )
-    calamares_automoc( libcalamarestestpaths )
 
+calamares_add_test(
+    libcalamarestestpaths
+    SOURCES
+        utils/TestPaths.cpp
+)
 
-    ecm_add_test(
+calamares_add_test(
-            geoip/GeoIPTests.cpp
+    geoiptest
-            ${geoip_src}
+    SOURCES
-        TEST_NAME
+        geoip/GeoIPTests.cpp
-            geoiptest
+        ${geoip_src}
-        LINK_LIBRARIES
+)
-            calamares
+
-            Qt5::Test
+calamares_add_test(
-    )
+    libcalamarespartitiontest
-    calamares_automoc( geoiptest )
+    SOURCES
-
+        partition/Tests.cpp
-    ecm_add_test(
+)
-            partition/Tests.cpp
+
-        TEST_NAME
+calamares_add_test(
-            libcalamarespartitiontest
+    libcalamareslocaletest
-        LINK_LIBRARIES
+    SOURCES
-            calamares
+        locale/Tests.cpp
-            Qt5::Test
+)
-    )
+
-    calamares_automoc( libcalamarespartitiontest )
+calamares_add_test(
-
+    libcalamaresnetworktest
-    ecm_add_test(
+    SOURCES
-            locale/Tests.cpp
+        network/Tests.cpp
-        TEST_NAME
+)
-            libcalamareslocaletest
+
-        LINK_LIBRARIES
+calamares_add_test(
-            calamares
+    libcalamaresmodulesystemtest
-            Qt5::Test
+    SOURCES
-    )
+        modulesystem/Tests.cpp
-    calamares_automoc( libcalamareslocaletest )
+)
-
-    ecm_add_test(
-            network/Tests.cpp
-        TEST_NAME
-            libcalamaresnetworktest
-        LINK_LIBRARIES
-            calamares
-            Qt5::Test
-    )
-    calamares_automoc( libcalamaresnetworktest )
-
-    ecm_add_test(
-            modulesystem/Tests.cpp
-        TEST_NAME
-            libcalamaresmodulesystemtest
-        LINK_LIBRARIES
-            calamares
-            Qt5::Test
-    )
-    calamares_automoc( libcalamaresmodulesystemtest )
-endif()
 
 if( BUILD_TESTING )
     add_executable( test_geoip geoip/test_geoip.cpp ${geoip_src} )