Remove TILEDB_CRC32.

Its value has declined with the advent of vcpkg, and it is not used by anything in CI.
TileDB-Inc · Nov 20, 2023 · 7f52340 · 7f52340
1 parent cb534a2
commit 7f52340
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 222 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -578,10 +578,6 @@ if (TILEDB_TESTS)
   # C API array schema
   add_dependencies(tests unit_capi_filter unit_capi_filter_list unit_capi_dimension_label)
 
-  if (TILEDB_CRC32)
-    add_dependencies(tests unit_link_crc32)
-  endif()
-
   if (TILEDB_WEBP)
     add_dependencies(tests unit_link_webp)
   endif()

diff --git a/bootstrap b/bootstrap
@@ -67,7 +67,6 @@ Configuration:
     --enable-tools                  enables TileDB CLI tools (experimental)
     --enable-ccache                 enables use of ccache (if present)
     --enable-arrow-tests            enables the compilation of the arrow adapter unit tests
-    --enable-_crc32                 enables building of crc32 library and linkage test
     --enable-experimental-features  enables experimental TileDB features
     --enable-rest-tests             enables REST tests
     --enable-aws-s3-config          enables AWS S3 configuration for tests
@@ -114,7 +113,6 @@ tiledb_tools="OFF"
 tiledb_ccache="OFF"
 tiledb_arrow_tests="OFF"
 tiledb_experimental_features="OFF"
-tiledb_build_crc32="OFF"
 tiledb_build_webp="ON"
 tiledb_tests_enable_rest="OFF"
 tiledb_tests_aws_s3_config="OFF"
@@ -154,7 +152,6 @@ while test $# != 0; do
     --enable-tools) tiledb_tools="ON";;
     --enable-ccache) tiledb_ccache="ON";;
     --enable-arrow-tests) tiledb_arrow_tests="ON";;
-    --enable-_crc32) tiledb_build_crc32="ON";;
     --enable-experimental-features) tiledb_experimental_features="ON";;
     --enable-rest-tests) tiledb_tests_enable_rest="ON";;
     --enable-aws-s3-config) tiledb_tests_aws_s3_config="ON";;
@@ -184,7 +181,6 @@ for en in "${enables[@]}"; do
     tools) tiledb_tools="ON";;
     ccache) tiledb_ccache="ON";;
     arrow-tests) tiledb_arrow_tests="ON";;
-    _crc32) tiledb_build_crc32="ON";;
     hdfs) tiledb_hdfs="ON";;
     static-tiledb) tiledb_static="ON";;
     experimental-features) tiledb_experimental_features="ON";;
@@ -245,7 +241,6 @@ ${cmake} -DCMAKE_BUILD_TYPE=${build_type} \
     -DTILEDB_TESTS=${tiledb_tests} \
     -DTILEDB_CCACHE=${tiledb_ccache} \
     -DTILEDB_ARROW_TESTS=${tiledb_arrow_tests} \
-    -DTILEDB_CRC32=${tiledb_build_crc32} \
     -DTILEDB_WEBP=${tiledb_build_webp} \
     -DTILEDB_FORCE_ALL_DEPS=${tiledb_force_all_deps} \
     -DTILEDB_REMOVE_DEPRECATIONS=${tiledb_remove_deprecations} \

diff --git a/bootstrap.ps1 b/bootstrap.ps1
@@ -68,9 +68,6 @@ Enables building TileDB CLI tools (experimental)
 .PARAMETER EnableExperimentalFeatures
 Enables building TileDB Experimental features
 
-.PARAMETER _EnableCrc32
-Enables building of Crc32 and simple linkage test
-
 .PARAMETER EnableArrowTests
 Enables the compilation of the arrow adapter unit tests
 
@@ -135,7 +132,6 @@ Param(
     [switch]$EnableTools,
     [switch]$EnableExperimentalFeatures,
     [switch]$EnableBuildDeps,
-    [switch]$_EnableCrc32,
     [switch]$EnableArrowTests,
     [switch]$EnableRestTests,
     [switch]$EnableAwsS3Config,
@@ -276,11 +272,6 @@ if ($EnableBuildDeps.IsPresent) {
     $TileDBBuildDeps = "ON"
 }
 
-$BuildCrc32="OFF"
-if ($_EnableCrc32.IsPresent) {
-  $BuildCrc32="ON"
-}
-
 $ArrowTests="OFF"
 if ($EnableArrowTests.IsPresent) {
     $ArrowTests="ON"
@@ -329,7 +320,7 @@ if ($CMakeGenerator -eq $null) {
 
 # Run CMake.
 # We use Invoke-Expression so we can echo the command to the user.
-$CommandString = "cmake -A X64 -DTILEDB_VCPKG=$UseVcpkg -DCMAKE_BUILD_TYPE=$BuildType -DCMAKE_INSTALL_PREFIX=""$InstallPrefix"" -DCMAKE_PREFIX_PATH=""$DependencyDir"" -DMSVC_MP_FLAG=""/MP$BuildProcesses"" -DTILEDB_ASSERTIONS=$AssertionMode -DTILEDB_VERBOSE=$Verbosity -DTILEDB_AZURE=$UseAzure -DTILEDB_S3=$UseS3 -DTILEDB_GCS=$UseGcs -DTILEDB_SERIALIZATION=$UseSerialization -DTILEDB_WERROR=$Werror -DTILEDB_CPP_API=$CppApi -DTILEDB_TESTS=$Tests -DTILEDB_STATS=$Stats -DTILEDB_STATIC=$TileDBStatic -DTILEDB_FORCE_ALL_DEPS=$TileDBBuildDeps -DTILEDB_REMOVE_DEPRECATIONS=$RemoveDeprecations -DTILEDB_TOOLS=$TileDBTools -DTILEDB_EXPERIMENTAL_FEATURES=$TileDBExperimentalFeatures -DTILEDB_WEBP=$BuildWebP -DTILEDB_CRC32=$BuildCrc32 -DTILEDB_ARROW_TESTS=$ArrowTests -DTILEDB_TESTS_ENABLE_REST=$RestTests -DTILEDB_TESTS_AWS_S3_CONFIG=$ConfigureS3 -DTILEDB_INSTALL_FIND_DEPENDENCIES=$InstallFindDependencies $GeneratorFlag ""$SourceDirectory"""
+$CommandString = "cmake -A X64 -DTILEDB_VCPKG=$UseVcpkg -DCMAKE_BUILD_TYPE=$BuildType -DCMAKE_INSTALL_PREFIX=""$InstallPrefix"" -DCMAKE_PREFIX_PATH=""$DependencyDir"" -DMSVC_MP_FLAG=""/MP$BuildProcesses"" -DTILEDB_ASSERTIONS=$AssertionMode -DTILEDB_VERBOSE=$Verbosity -DTILEDB_AZURE=$UseAzure -DTILEDB_S3=$UseS3 -DTILEDB_GCS=$UseGcs -DTILEDB_SERIALIZATION=$UseSerialization -DTILEDB_WERROR=$Werror -DTILEDB_CPP_API=$CppApi -DTILEDB_TESTS=$Tests -DTILEDB_STATS=$Stats -DTILEDB_STATIC=$TileDBStatic -DTILEDB_FORCE_ALL_DEPS=$TileDBBuildDeps -DTILEDB_REMOVE_DEPRECATIONS=$RemoveDeprecations -DTILEDB_TOOLS=$TileDBTools -DTILEDB_EXPERIMENTAL_FEATURES=$TileDBExperimentalFeatures -DTILEDB_WEBP=$BuildWebP -DTILEDB_ARROW_TESTS=$ArrowTests -DTILEDB_TESTS_ENABLE_REST=$RestTests -DTILEDB_TESTS_AWS_S3_CONFIG=$ConfigureS3 -DTILEDB_INSTALL_FIND_DEPENDENCIES=$InstallFindDependencies $GeneratorFlag ""$SourceDirectory"""
 Write-Host $CommandString
 Write-Host
 Invoke-Expression "$CommandString"

diff --git a/cmake/Modules/FindCrc32c_EP.cmake b/cmake/Modules/FindCrc32c_EP.cmake
diff --git a/cmake/Options/BuildOptions.cmake b/cmake/Options/BuildOptions.cmake
@@ -28,7 +28,6 @@ option(TILEDB_TOOLS "If true, enables building the TileDB tools" OFF)
 option(TILEDB_SERIALIZATION "If true, enables building with support for query serialization" OFF)
 option(TILEDB_CCACHE "If true, enables use of 'ccache' (if present)" OFF)
 option(TILEDB_ARROW_TESTS "If true, enables building the arrow adapter unit tests" OFF)
-option(TILEDB_CRC32 "If true, enables building crc32 and a simple linkage test" OFF)
 option(TILEDB_WEBP "If true, enables building webp and a simple linkage test" ON)
 option(TILEDB_LOG_OUTPUT_ON_FAILURE "If true, print error logs if dependency sub-project build fails" ON)
 option(TILEDB_SKIP_S3AWSSDK_DIR_LENGTH_CHECK "If true, skip check needed path length for awssdk (TILEDB_S3) dependent builds" OFF)

diff --git a/cmake/TileDB-Superbuild.cmake b/cmake/TileDB-Superbuild.cmake
@@ -52,7 +52,6 @@ set(INHERITED_CMAKE_ARGS
   -DTILEDB_TOOLS=${TILEDB_TOOLS}
   -DTILEDB_SERIALIZATION=${TILEDB_SERIALIZATION}
   -DTILEDB_ARROW_TESTS=${TILEDB_ARROW_TESTS}
-  -DTILEDB_CRC32=${TILEDB_CRC32}
   -DTILEDB_WEBP=${TILEDB_WEBP}
   -DTILEDB_INSTALL_LIBDIR=${TILEDB_INSTALL_LIBDIR}
   -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
@@ -106,10 +105,6 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindZlib_EP.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindZstd_EP.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindMagic_EP.cmake)
 
-if(TILEDB_CRC32)
-  include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindCrc32c_EP.cmake)
-endif()
-
 if(TILEDB_WEBP)
   include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindWebp_EP.cmake)
 endif()

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -406,6 +406,3 @@ add_subdirectory(ci)
 if(WIN32)
   add_subdirectory(performance)
 endif()
-
-#add tests related to external items
-add_subdirectory(external)
diff --git a/test/external/CMakeLists.txt b/test/external/CMakeLists.txt
diff --git a/test/external/src/crc32_link_test.cc b/test/external/src/crc32_link_test.cc
diff --git a/tiledb/CMakeLists.txt b/tiledb/CMakeLists.txt
@@ -662,19 +662,6 @@ target_link_libraries(TILEDB_CORE_OBJECTS_ILIB
     libmagic
 )
 
-if(TILEDB_CRC32)
-  find_package(crc32c_EP REQUIRED)
-  find_package(crc32c CONFIG REQUIRED
-    HINTS
-      ${TILEDB_EP_INSTALL_PREFIX}/lib/cmake
-    )
-
-  target_link_libraries(TILEDB_CORE_OBJECTS_ILIB
-    INTERFACE
-    Crc32c::crc32c
-  )
-endif()
-
 if(TILEDB_WEBP)
   find_package(Webp_EP REQUIRED)
   target_link_libraries(TILEDB_CORE_OBJECTS_ILIB