Просмотр исходного кода

Remove boost/multiprecision from metaproject

bugaevskiy 2 лет назад
Родитель
Сommit
98a6390ee5

+ 1 - 1
contrib/libs/apache/arrow/CMakeLists.txt

@@ -42,7 +42,6 @@ target_include_directories(libs-apache-arrow PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/re2
   ${CMAKE_SOURCE_DIR}/contrib/libs/utf8proc
   ${CMAKE_SOURCE_DIR}/contrib/libs/zstd/include
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/boost
 )
 target_link_libraries(libs-apache-arrow PUBLIC
   contrib-libs-cxxsupp
@@ -59,6 +58,7 @@ target_link_libraries(libs-apache-arrow PUBLIC
   ZLIB::ZLIB
   contrib-libs-zstd
   contrib-restricted-boost
+  restricted-boost-multiprecision
   contrib-restricted-fast_float
   contrib-restricted-thrift
   contrib-restricted-uriparser

+ 1 - 1
contrib/libs/apache/arrow/cpp/src/parquet/thrift_internal.h

@@ -23,7 +23,7 @@
 // Check if thrift version < 0.11.0
 // or if FORCE_BOOST_SMART_PTR is defined. Ref: https://thrift.apache.org/lib/cpp
 #if defined(PARQUET_THRIFT_USE_BOOST) || defined(FORCE_BOOST_SMART_PTR)
-#include <boost/shared_ptr.hpp>
+#error #include <boost/shared_ptr.hpp>
 #else
 #include <memory>
 #endif

+ 0 - 1
contrib/restricted/boost/CMakeLists.txt

@@ -127,7 +127,6 @@ target_link_libraries(contrib-restricted-boost INTERFACE
   restricted-boost-mpl
   restricted-boost-multi_array
   restricted-boost-multi_index
-  restricted-boost-multiprecision
   restricted-boost-numeric_conversion
   restricted-boost-optional
   restricted-boost-parameter