[arrow] branch master updated: ARROW-2120: [C++] Add possibility to use empty _MSVC_STATIC_LIB_SUFFIX for Thirdparties

[wesm]

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 ddae240  ARROW-2120: [C++] Add possibility to use empty 
_MSVC_STATIC_LIB_SUFFIX for Thirdparties
ddae240 is described below

commit ddae2407fe26c97316f3b09f9b20da0e6785703c
Author: rip.nsk <rip....@gmail.com>
AuthorDate: Fri Feb 9 14:01:22 2018 -0500

    ARROW-2120: [C++] Add possibility to use empty _MSVC_STATIC_LIB_SUFFIX for 
Thirdparties
    
    Author: rip.nsk <rip....@gmail.com>
    
    Closes #1580 from rip-nsk/ARROW-2120 and squashes the following commits:
    
    7d1b1554 [rip.nsk] Add possibility to use empty _MSVC_STATIC_LIB_SUFFIX for 
Thirdparties
---
 cpp/cmake_modules/FindArrow.cmake   | 2 +-
 cpp/cmake_modules/FindGFlags.cmake  | 2 +-
 cpp/cmake_modules/FindLz4.cmake     | 2 +-
 cpp/cmake_modules/FindParquet.cmake | 2 +-
 cpp/cmake_modules/FindZSTD.cmake    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cpp/cmake_modules/FindArrow.cmake 
b/cpp/cmake_modules/FindArrow.cmake
index bce4404..70defd6 100644
--- a/cpp/cmake_modules/FindArrow.cmake
+++ b/cpp/cmake_modules/FindArrow.cmake
@@ -70,7 +70,7 @@ get_filename_component(ARROW_PYTHON_LIBS 
${ARROW_PYTHON_LIB_PATH} DIRECTORY)
 if (MSVC)
   SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
 
-  if (MSVC AND NOT ARROW_MSVC_STATIC_LIB_SUFFIX)
+  if (MSVC AND NOT DEFINED ARROW_MSVC_STATIC_LIB_SUFFIX)
     set(ARROW_MSVC_STATIC_LIB_SUFFIX "_static")
   endif()
 
diff --git a/cpp/cmake_modules/FindGFlags.cmake 
b/cpp/cmake_modules/FindGFlags.cmake
index 63a55d7..f71950c 100644
--- a/cpp/cmake_modules/FindGFlags.cmake
+++ b/cpp/cmake_modules/FindGFlags.cmake
@@ -29,7 +29,7 @@ elseif ( GFlags_HOME )
     list( APPEND _gflags_roots ${GFlags_HOME} )
 endif()
 
-if (MSVC AND NOT GFLAGS_MSVC_STATIC_LIB_SUFFIX)
+if (MSVC AND NOT DEFINED GFLAGS_MSVC_STATIC_LIB_SUFFIX)
   set(GFLAGS_MSVC_STATIC_LIB_SUFFIX "_static")
 endif()
 
diff --git a/cpp/cmake_modules/FindLz4.cmake b/cpp/cmake_modules/FindLz4.cmake
index 07707cf..3a89c8d 100644
--- a/cpp/cmake_modules/FindLz4.cmake
+++ b/cpp/cmake_modules/FindLz4.cmake
@@ -29,7 +29,7 @@ elseif ( Lz4_HOME )
     list( APPEND _lz4_roots ${Lz4_HOME} )
 endif()
 
-if (MSVC AND NOT LZ4_MSVC_STATIC_LIB_SUFFIX)
+if (MSVC AND NOT DEFINED LZ4_MSVC_STATIC_LIB_SUFFIX)
   set(LZ4_MSVC_STATIC_LIB_SUFFIX "_static")
 endif()
 
diff --git a/cpp/cmake_modules/FindParquet.cmake 
b/cpp/cmake_modules/FindParquet.cmake
index 8bbe05f..68b004c 100644
--- a/cpp/cmake_modules/FindParquet.cmake
+++ b/cpp/cmake_modules/FindParquet.cmake
@@ -33,7 +33,7 @@ endif()
 if (MSVC)
   SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
 
-  if (MSVC AND NOT PARQUET_MSVC_STATIC_LIB_SUFFIX)
+  if (MSVC AND NOT DEFINED PARQUET_MSVC_STATIC_LIB_SUFFIX)
     set(PARQUET_MSVC_STATIC_LIB_SUFFIX "_static")
   endif()
 
diff --git a/cpp/cmake_modules/FindZSTD.cmake b/cpp/cmake_modules/FindZSTD.cmake
index 02a0c39..810e5c0 100644
--- a/cpp/cmake_modules/FindZSTD.cmake
+++ b/cpp/cmake_modules/FindZSTD.cmake
@@ -29,7 +29,7 @@ elseif ( ZStd_HOME )
     list( APPEND _zstd_roots ${ZStd_HOME} )
 endif()
 
-if (MSVC AND NOT ZSTD_MSVC_STATIC_LIB_SUFFIX)
+if (MSVC AND NOT DEFINED ZSTD_MSVC_STATIC_LIB_SUFFIX)
   set(ZSTD_MSVC_STATIC_LIB_SUFFIX "_static")
 endif()
 

-- 
To stop receiving notification emails like this one, please contact
w...@apache.org.