cmake: tests refactoring

igagis · igagis · commit a2d3ae239951 · 2025-11-17T15:52:22.000+02:00
diff --git a/build/cmake/unit_tests.cmake b/build/cmake/unit_tests.cmake
@@ -1,4 +1,4 @@
-# if the library is compiled by vcpkg during the port build,
+# if the library is compiled by vcpkg during the port build (i.e. during the package installation),
 # then we don't need to build unit tests
 if(IS_VCPKG_PORT_BUILD)
     return()
@@ -9,42 +9,76 @@ if(IOS)
     return()
 endif()
 
-set(test_srcs)
-myci_add_source_files(test_srcs
-    DIRECTORY
-        ${CMAKE_CURRENT_LIST_DIR}/../../tests/unit/src
-    RECURSIVE
-)
-
+# For unit tests we need the tst testing framework library which in turn depends on utki.
 if(CPPFW_MONOREPO)
-    set(utki_test_harness_dir ${CMAKE_CURRENT_LIST_DIR}/../../..)
+    # In case of monorepo build we can add necessary tst dependencies right here.
+
+    myci_add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../../../clargs/build/cmake
+        BINARY_DIR
+            clargs
+    )
+    myci_add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../../../opros/build/cmake
+        BINARY_DIR
+            opros
+    )
+    myci_add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../../../nitki/build/cmake
+        BINARY_DIR
+            nitki
+    )
+    myci_add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../../../tst/build/cmake
+        BINARY_DIR
+            tst
+    )
+
+    set(tst_dep tst::tst)
 else()
+    # In case of non-monorepo build, we need to build the tst framework
+    # from sources (from git submodules) together with unit tests.
+
     set(utki_test_harness_dir ${CMAKE_CURRENT_LIST_DIR}/../../tests/harness)
-endif()
 
-myci_add_source_files(test_srcs
-    DIRECTORY
-        ${utki_test_harness_dir}/tst/src
-    RECURSIVE
-)
+    myci_add_source_files(tst_srcs
+        DIRECTORY
+            ${utki_test_harness_dir}/tst/src
+        RECURSIVE
+    )
+
+    myci_add_source_files(tst_srcs
+        DIRECTORY
+            ${utki_test_harness_dir}/clargs/src
+        RECURSIVE
+    )
 
+    myci_declare_library(tst
+        SOURCES
+            ${tst_srcs}
+        PUBLIC_INCLUDE_DIRECTORIES
+            ${utki_test_harness_dir}/tst/src
+        PRIVATE_INCLUDE_DIRECTORIES
+            ${utki_test_harness_dir}/clargs/src
+        PREPROCESSOR_DEFINITIONS
+            TST_NO_PAR
+        DEPENDENCIES
+            utki
+    )
+
+    set(tst_dep ${PROJECT_NAME}::tst)
+endif()
+
+set(test_srcs)
 myci_add_source_files(test_srcs
     DIRECTORY
-        ${utki_test_harness_dir}/clargs/src
+        ${CMAKE_CURRENT_LIST_DIR}/../../tests/unit/src
     RECURSIVE
 )
 
 myci_declare_application(${PROJECT_NAME}-tests
     GUI
     SOURCES
         ${test_srcs}
-    INCLUDE_DIRECTORIES
-        ${utki_test_harness_dir}/tst/src
-        ${utki_test_harness_dir}/clargs/src
-    PREPROCESSOR_DEFINITIONS
-        TST_NO_PAR
     DEPENDENCIES
         utki
+        ${tst_dep}
 )
 
 myci_declare_test(${PROJECT_NAME})
diff --git a/build/vcpkg/test/vcpkg-configuration.json b/build/vcpkg/test/vcpkg-configuration.json
@@ -8,7 +8,7 @@
       {
         "kind": "git",
         "repository": "https://github.com/cppfw/vcpkg-repo/",
-        "baseline": "9fd38ca696d8fa2a0cdff1e580108a6e4514ee1a",
+        "baseline": "0ff688afe5409ffc80ff8d1be654bc5a6a8ac9fc",
         "reference": "main",
         "packages": [
           "myci"

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`{`
`9`	`9`	`"kind": "git",`
`10`	`10`	`"repository": "https://github.com/cppfw/vcpkg-repo/",`
`11`		`- "baseline": "9fd38ca696d8fa2a0cdff1e580108a6e4514ee1a",`
	`11`	`+ "baseline": "0ff688afe5409ffc80ff8d1be654bc5a6a8ac9fc",`
`12`	`12`	`"reference": "main",`
`13`	`13`	`"packages": [`
`14`	`14`	`"myci"`