resolve review comments

zhjwpku · zhjwpku · commit 457eb0c95ec3 · 2026-05-05T22:44:40.000+08:00
diff --git a/src/iceberg/CMakeLists.txt b/src/iceberg/CMakeLists.txt
@@ -203,10 +203,6 @@ add_iceberg_lib(iceberg_data
                 SHARED_INSTALL_INTERFACE_LIBS
                 ${ICEBERG_DATA_SHARED_INSTALL_INTERFACE_LIBS})
 
-if(TARGET iceberg_data_static)
-  target_compile_definitions(iceberg_data_static PRIVATE ICEBERG_STATIC)
-endif()
-
 iceberg_install_all_headers(iceberg)
 
 add_subdirectory(catalog)
diff --git a/src/iceberg/meson.build b/src/iceberg/meson.build
@@ -201,7 +201,7 @@ iceberg_data_lib = library(
 )
 
 iceberg_data_interface_args = []
-if get_option('default_library') != 'shared'
+if get_option('default_library') == 'static'
     iceberg_data_interface_args += ['-DICEBERG_DATA_STATIC']
 endif
 
diff --git a/src/iceberg/test/CMakeLists.txt b/src/iceberg/test/CMakeLists.txt
@@ -134,8 +134,6 @@ add_iceberg_test(util_test
                  uuid_test.cc
                  visit_type_test.cc)
 
-add_iceberg_test(roaring_test USE_DATA SOURCES roaring_test.cc)
-
 add_iceberg_test(puffin_test
                  USE_DATA
                  SOURCES
diff --git a/src/iceberg/test/meson.build b/src/iceberg/test/meson.build
@@ -104,7 +104,6 @@ iceberg_tests = {
         ),
         'use_data': true,
     },
-    'roaring_test': {'sources': files('roaring_test.cc'), 'use_data': true},
     'puffin_test': {
         'sources': files('puffin_format_test.cc', 'puffin_json_test.cc'),
         'use_data': true,
diff --git a/src/iceberg/test/roaring_test.cc b/src/iceberg/test/roaring_test.cc

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ iceberg_data_lib = library(`
`201`	`201`	`)`
`202`	`202`
`203`	`203`	`iceberg_data_interface_args = []`
`204`		`-if get_option('default_library') != 'shared'`
	`204`	`+if get_option('default_library') == 'static'`
`205`	`205`	`iceberg_data_interface_args += ['-DICEBERG_DATA_STATIC']`
`206`	`206`	`endif`
`207`	`207`