arrow-cpp: fixup after protobuf bump
This commit is contained in:
parent
86f6b16d28
commit
1da9ecb9dc
|
@ -0,0 +1,18 @@
|
||||||
|
diff --git a/cmake_modules/FindProtobufAlt.cmake b/cmake_modules/FindProtobufAlt.cmake
|
||||||
|
index d29f757ae..61c6e16e1 100644
|
||||||
|
--- a/cmake_modules/FindProtobufAlt.cmake
|
||||||
|
+++ b/cmake_modules/FindProtobufAlt.cmake
|
||||||
|
@@ -22,11 +22,8 @@ else()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(find_package_args)
|
||||||
|
-if(ProtobufAlt_FIND_VERSION)
|
||||||
|
- list(APPEND find_package_args ${ProtobufAlt_FIND_VERSION})
|
||||||
|
-endif()
|
||||||
|
if(ProtobufAlt_FIND_QUIETLY)
|
||||||
|
list(APPEND find_package_args QUIET)
|
||||||
|
endif()
|
||||||
|
-find_package(Protobuf ${find_package_args})
|
||||||
|
-set(ProtobufAlt_FOUND ${Protobuf_FOUND})
|
||||||
|
+find_package(protobuf ${find_package_args})
|
||||||
|
+set(ProtobufAlt_FOUND ${protobuf_FOUND})
|
|
@ -122,6 +122,7 @@ stdenv.mkDerivation rec {
|
||||||
patches = [
|
patches = [
|
||||||
# patch to fix python-test
|
# patch to fix python-test
|
||||||
./darwin.patch
|
./darwin.patch
|
||||||
|
./cmake-find-protobuf.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -169,6 +170,7 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
"-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON"
|
||||||
"-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}"
|
"-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}"
|
||||||
"-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}"
|
"-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}"
|
||||||
"-DARROW_BUILD_TESTS=ON"
|
"-DARROW_BUILD_TESTS=ON"
|
||||||
|
|
Loading…
Reference in a new issue