diff options
author | Nilesh Patra <nilesh@debian.org> | 2022-04-14 20:28:47 +0200 |
---|---|---|
committer | Nilesh Patra <nilesh@debian.org> | 2022-04-14 20:28:47 +0200 |
commit | 16a102c417ea67fc7ff4ae40df31e99c83f6093c (patch) | |
tree | bf6c4ee436a567c4b4bfcd3c405ed11d8ab32c26 | |
parent | 4596a78b6a8f6a9c4818c7a9f506f978c83599c6 (diff) |
Use packaged streamvbyte instead of third_party
Forwarded: not-needed
Last-Update: 2021-05-22
Gbp-Pq: Name use-packaged-streamvbyte.patch
-rw-r--r-- | CMakeLists.txt | 30 | ||||
-rw-r--r-- | vbz/CMakeLists.txt | 16 |
2 files changed, 8 insertions, 38 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f01ecd..5a6f360 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,34 +138,8 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/third_party") find_package(HDF5 1.8.16) 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_static${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 -DCMAKE_INSTALL_PREFIX=${STREAMVBYTE_INSTALL_DIR} -DSTREAMVBYTE_DISABLE_NATIVE=ON -DSTD_FLAGS="-std=c99" - # 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_NAME}" -) -ExternalProject_Get_Property(streamvbyte BINARY_DIR) -set(STREAMVBYTE_STATIC_LIB "${BINARY_DIR}/${STREAMVBYTE_STATIC_LIB_SUBDIR}/${STREAMVBYTE_STATIC_LIB_NAME}") - +find_library(STREAMVBYTE_STATIC_LIB NAMES libstreamvbyte.a PATHS /usr/lib/$ENV{DEB_HOST_MULTIARCH}) +message("INFO: The library that was found is: ${STREAMVBYTE_STATIC_LIB}") ######################################################################## # diff --git a/vbz/CMakeLists.txt b/vbz/CMakeLists.txt index 0791655..d519f7d 100644 --- a/vbz/CMakeLists.txt +++ b/vbz/CMakeLists.txt @@ -22,14 +22,16 @@ target_include_directories(vbz PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${STREAMVBYTE_INSTALL_DIR}/include +) + +target_link_libraries(vbz + PUBLIC + ${STREAMVBYTE_STATIC_LIB} + zstd::zstd ) # This explicit dependency is required to make sure the header files are installed into the right # location before we try building against them. -add_dependencies(vbz - streamvbyte -) if (WIN32 OR APPLE OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") if(NOT MSVC) @@ -37,12 +39,6 @@ if (WIN32 OR APPLE OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") endif() endif() -target_link_libraries(vbz - PUBLIC - ${STREAMVBYTE_STATIC_LIB} - zstd::zstd -) - if (BUILD_TESTING) add_subdirectory(fuzzing) add_subdirectory(test) |