[arrow] branch master updated: ARROW-3598: [Plasma] Fix Plasma GPU linking error.

[we...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wesm 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 03e7346  ARROW-3598: [Plasma] Fix Plasma GPU linking error.
03e7346 is described below

commit 03e734606c8af6b17a97a32c3fb86676980da63c
Author: Robert Nishihara <ro...@gmail.com>
AuthorDate: Wed Oct 24 04:38:34 2018 -0400

    ARROW-3598: [Plasma] Fix Plasma GPU linking error.
    
    This should revert to the prior behavior from before all of the linking changes. However, I haven't confirmed that it works. @pitrou could you try this out?
    
    Author: Robert Nishihara <ro...@gmail.com>
    Author: Wes McKinney <we...@apache.org>
    
    Closes #2820 from robertnishihara/fixgpulinking and squashes the following commits:
    
    55df788f5 <Wes McKinney> Link libarrow_gpu.a before libarrow.a
    9fdc93c5b <Robert Nishihara> Fix Plasma GPU linking error.
---
 cpp/src/plasma/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/src/plasma/CMakeLists.txt b/cpp/src/plasma/CMakeLists.txt
index 0928249..adf27de 100644
--- a/cpp/src/plasma/CMakeLists.txt
+++ b/cpp/src/plasma/CMakeLists.txt
@@ -86,7 +86,7 @@ set(PLASMA_STATIC_LINK_LIBS arrow_static)
 
 if (ARROW_GPU)
   set(PLASMA_LINK_LIBS ${PLASMA_LINK_LIBS} arrow_gpu_shared)
-  set(PLASMA_STATIC_LINK_LIBS ${PLASMA_STATIC_LINK_LIBS} arrow_gpu_static)
+  set(PLASMA_STATIC_LINK_LIBS arrow_gpu_static ${PLASMA_STATIC_LINK_LIBS})
   add_definitions(-DPLASMA_GPU)
 endif()