blob: c1d4296057ec57cb0a62df87a96844e5ae3cd782 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
--- CMakeLists.txt.orig 2025-01-14 12:40:34 UTC
+++ CMakeLists.txt
@@ -151,39 +151,6 @@ find_package(Sanitizers)
find_package(zstd 1.3.1 REQUIRED)
find_package(Sanitizers)
-get_filename_component(STREAMVBYTE_SOURCE_DIR
- third_party/streamvbyte
- ABSOLUTE
-)
-set(STREAMVBYTE_INSTALL_DIR "${CMAKE_BINARY_DIR}/streamvbyte_lib/")
-set(STREAMVBYTE_PREFIX ${CMAKE_BINARY_DIR}/streamvbyte)
-set(STREAMVBYTE_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}streamvbyte${CMAKE_STATIC_LIBRARY_SUFFIX})
-set(STREAMVBYTE_STATIC_LIB_SUBDIR ".")
-get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
-if (is_multi_config)
- set(STREAMVBYTE_STATIC_LIB_SUBDIR "$<CONFIG>")
-endif()
-ExternalProject_Add(
- streamvbyte
- SOURCE_DIR ${STREAMVBYTE_SOURCE_DIR}
- UPDATE_DISCONNECTED TRUE
- PREFIX ${STREAMVBYTE_PREFIX}
- CMAKE_ARGS
- -D CMAKE_INSTALL_PREFIX=${STREAMVBYTE_INSTALL_DIR}
- -D CMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
- -D CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
- -D STREAMVBYTE_SANITIZE=${SANITIZE_ADDRESS}
- -D STREAMVBYTE_SANITIZE_UNDEFINED=${SANITIZE_UNDEFINED}
- # We need to tell CMake about libraries we will link to, otherwise some generators (eg: Ninja)
- # complain about how knowing how to build libstreamvbyte_static.a, for example.
- # Ideally, we'd set a hypothetical INSTALL_BYPRODUCTS, and link to the installed file, but that
- # doesn't seem to be an option.
- BUILD_BYPRODUCTS "<BINARY_DIR>/${STREAMVBYTE_STATIC_LIB_SUBDIR}/${STREAMVBYTE_STATIC_LIB_NAME}"
-)
-ExternalProject_Get_Property(streamvbyte BINARY_DIR)
-set(STREAMVBYTE_STATIC_LIB "${BINARY_DIR}/${STREAMVBYTE_STATIC_LIB_SUBDIR}/${STREAMVBYTE_STATIC_LIB_NAME}")
-
-
########################################################################
#
# Warnings
|
