update

Author: HeartLinked

src/iceberg/test/CMakeLists.txt

@@ -28,8 +28,6 @@ set(ICEBERG_TEST_RESOURCES "${CMAKE_SOURCE_DIR}/src/iceberg/test/resources")
 
 configure_file("test_config.h.in" "test_config.h")
 
-add_subdirectory(util)
-
 function(add_iceberg_test test_name)
   set(options USE_BUNDLE)
   set(oneValueArgs)
@@ -41,16 +39,15 @@ function(add_iceberg_test test_name)
                         ${ARGN})
 
   add_executable(${test_name})
-  target_include_directories(${test_name} PRIVATE "${CMAKE_BINARY_DIR}/iceberg/test/")
+  target_include_directories(${test_name} PRIVATE "${CMAKE_BINARY_DIR}/iceberg/test/"
+                                                  "${CMAKE_SOURCE_DIR}/src")
 
-  target_sources(${test_name} PRIVATE ${ARG_SOURCES})
+  target_sources(${test_name} PRIVATE ${ARG_SOURCES} util/common_util.cc)
 
   if(ARG_USE_BUNDLE)
-    target_link_libraries(${test_name} PRIVATE iceberg_bundle_static GTest::gmock_main
-                                               iceberg_test_util)
+    target_link_libraries(${test_name} PRIVATE iceberg_bundle_static GTest::gmock_main)
   else()
-    target_link_libraries(${test_name} PRIVATE iceberg_static GTest::gmock_main
-                                               iceberg_test_util)
+    target_link_libraries(${test_name} PRIVATE iceberg_static GTest::gmock_main)
   endif()
 
   add_test(NAME ${test_name} COMMAND ${test_name})
@@ -161,10 +158,10 @@ if(ICEBERG_BUILD_REST)
                           ${ARGN})
 
     add_executable(${test_name})
-    target_include_directories(${test_name} PRIVATE "${CMAKE_BINARY_DIR}/iceberg/test/")
-    target_sources(${test_name} PRIVATE ${ARG_SOURCES})
-    target_link_libraries(${test_name} PRIVATE GTest::gmock_main iceberg_rest_static
-                                               iceberg_test_util)
+    target_include_directories(${test_name} PRIVATE "${CMAKE_BINARY_DIR}/iceberg/test/"
+                                                    "${CMAKE_SOURCE_DIR}/src")
+    target_sources(${test_name} PRIVATE ${ARG_SOURCES} util/common_util.cc)
+    target_link_libraries(${test_name} PRIVATE GTest::gmock_main iceberg_rest_static)
     add_test(NAME ${test_name} COMMAND ${test_name})
   endfunction()
 

src/iceberg/test/meson.build

@@ -27,8 +27,6 @@ configure_file(
     install_dir: get_option('includedir') / 'iceberg/test',
 )
 
-subdir('util')
-
 iceberg_tests = {
     'schema_test': {
         'sources': files(
@@ -115,11 +113,12 @@ endif
 foreach test_name, values : iceberg_tests
     exc = executable(
         test_name,
-        sources: values['sources'],
-        dependencies: [iceberg_dep, gmock_main_dep, iceberg_test_util_dep] + values.get(
+        sources: values['sources'] + files('util/common_util.cc'),
+        dependencies: [iceberg_dep, gmock_main_dep] + values.get(
             'dependencies',
             [],
         ),
+        include_directories: include_directories('.'),
     )
     test(test_name, exc)
 endforeach