You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2017/07/24 02:32:53 UTC

arrow git commit: ARROW-1241: [C++] Appveyor build matrix extended with Visual Studio 2…

Repository: arrow
Updated Branches:
  refs/heads/master 2c8101515 -> fabf7fb6a


ARROW-1241: [C++] Appveyor build matrix extended with Visual Studio 2…

…017 environment build job

Author: Max Risuhin <ri...@gmail.com>

Closes #870 from MaxRis/ARROW-1241 and squashes the following commits:

a3ba6b0 [Max Risuhin] ARROW-1241: [C++] Appveyor build matrix extended with Visual Studio 2017 environment build job


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/fabf7fb6
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/fabf7fb6
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/fabf7fb6

Branch: refs/heads/master
Commit: fabf7fb6ae80f7d4dc324bf562e35ad6ee55fe31
Parents: 2c81015
Author: Max Risuhin <ri...@gmail.com>
Authored: Sun Jul 23 22:32:47 2017 -0400
Committer: Wes McKinney <we...@twosigma.com>
Committed: Sun Jul 23 22:32:47 2017 -0400

----------------------------------------------------------------------
 appveyor.yml                     | 7 +++++++
 cpp/cmake_modules/SnappyConfig.h | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/fabf7fb6/appveyor.yml
----------------------------------------------------------------------
diff --git a/appveyor.yml b/appveyor.yml
index c58e1da..91e9ee2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -45,6 +45,13 @@ environment:
       PYTHON: "3.5"
       ARCH: "64"
       CONFIGURATION: "Release"
+    - JOB: "Build"
+      GENERATOR: Visual Studio 15 2017 Win64
+      PYTHON: "3.5"
+      ARCH: "64"
+      CONFIGURATION: "Release"
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      BOOST_ROOT: C:\Libraries\boost_1_64_0
 
   MSVC_DEFAULT_OPTIONS: ON
   BOOST_ROOT: C:\Libraries\boost_1_63_0

http://git-wip-us.apache.org/repos/asf/arrow/blob/fabf7fb6/cpp/cmake_modules/SnappyConfig.h
----------------------------------------------------------------------
diff --git a/cpp/cmake_modules/SnappyConfig.h b/cpp/cmake_modules/SnappyConfig.h
index 74eb776..c998d18 100644
--- a/cpp/cmake_modules/SnappyConfig.h
+++ b/cpp/cmake_modules/SnappyConfig.h
@@ -29,7 +29,7 @@
 #ifndef SNAPPY_CONFIG_H
 #define SNAPPY_CONFIG_H 1
 
-#if defined(_MSC_VER) && (_MSC_VER <= 1900)
+#if defined(_MSC_VER) && (_MSC_VER <= 1910)
 typedef __int64 ssize_t;
 #endif