[arrow] branch master updated: ARROW-4624: [C++] Fix building benchmarks

[kszucs]

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

kszucs 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 707bac2  ARROW-4624: [C++] Fix building benchmarks
707bac2 is described below

commit 707bac28caab94b6aaa1951a91726cd66178a9ee
Author: Antoine Pitrou <anto...@python.org>
AuthorDate: Tue Feb 19 14:51:31 2019 +0100

    ARROW-4624: [C++] Fix building benchmarks
    
    Author: Antoine Pitrou <anto...@python.org>
    
    Closes #3701 from pitrou/ARROW-4624-fix-cpp-benchmarks and squashes the 
following commits:
    
    97ec6a19 <Antoine Pitrou> ARROW-4624:  Fix building benchmarks
---
 cpp/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index d0b7c35..548e5c2 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -806,16 +806,16 @@ if(NOT MSVC)
   set(ARROW_TEST_SHARED_LINK_LIBS ${ARROW_TEST_SHARED_LINK_LIBS} 
${CMAKE_DL_LIBS})
 endif()
 
-if(ARROW_BUILD_TESTS AND "${ARROW_TEST_LINKAGE}" STREQUAL "shared")
-  if(NOT ARROW_BUILD_SHARED)
+if("${ARROW_TEST_LINKAGE}" STREQUAL "shared")
+  if(ARROW_BUILD_TESTS AND NOT ARROW_BUILD_SHARED)
     message(FATAL_ERROR "If using shared linkage for unit tests, must also \
 pass ARROW_BUILD_SHARED=on")
   endif()
   # Use shared linking for unit tests if it's available
   set(ARROW_TEST_LINK_LIBS ${ARROW_TEST_SHARED_LINK_LIBS})
   set(ARROW_EXAMPLE_LINK_LIBS arrow_shared)
-elseif(ARROW_BUILD_TESTS)
-  if(NOT ARROW_BUILD_STATIC)
+else()
+  if(ARROW_BUILD_TESTS AND NOT ARROW_BUILD_STATIC)
     message(FATAL_ERROR "If using static linkage for unit tests, must also \
 pass ARROW_BUILD_STATIC=on")
   endif()