This is an automated email from the ASF dual-hosted git repository.
uwe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new a82a027 ARROW-2721: [C++] Fix ORC and Protocol Buffers link error
a82a027 is described below
commit a82a0273a0b9f8583de005d96475ab8685963ed8
Author: Kouhei Sutou <[email protected]>
AuthorDate: Tue Jun 19 10:38:45 2018 +0200
ARROW-2721: [C++] Fix ORC and Protocol Buffers link error
It's introduced at 408aa5a699887e24181abcde01c86ba09982013a by me.
Sorry.
Author: Kouhei Sutou <[email protected]>
Closes #2146 from kou/cpp-fix-orc-and-protobuf-link-error and squashes the
following commits:
725d7834 <Kouhei Sutou> Fix ORC and Protocol Buffers link error
---
cpp/CMakeLists.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index d7bebf6..5f29bda 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -593,9 +593,6 @@ if (ARROW_WITH_GRPC)
endif()
if (ARROW_ORC)
- SET(ARROW_STATIC_LINK_LIBS
- orc
- ${ARROW_STATIC_LINK_LIBS})
if (ARROW_PROTOBUF_USE_SHARED)
SET(ARROW_LINK_LIBS
protobuf
@@ -605,6 +602,9 @@ if (ARROW_ORC)
protobuf
${ARROW_STATIC_LINK_LIBS})
endif()
+ SET(ARROW_STATIC_LINK_LIBS
+ orc
+ ${ARROW_STATIC_LINK_LIBS})
endif()
if (ARROW_STATIC_LINK_LIBS)
