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 2019/02/09 19:34:38 UTC
[arrow] branch master updated: ARROW-4462: [C++] Upgrade LZ4 v1.7.5
to v1.8.3 to compile with VS2017
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 84cefdc ARROW-4462: [C++] Upgrade LZ4 v1.7.5 to v1.8.3 to compile with VS2017
84cefdc is described below
commit 84cefdc4326ec0890ad97816e7b3cdb3739d1540
Author: Areg Melik-Adamyan <ar...@intel.com>
AuthorDate: Sat Feb 9 13:34:24 2019 -0600
ARROW-4462: [C++] Upgrade LZ4 v1.7.5 to v1.8.3 to compile with VS2017
LZ4 library version bumped to 1.8.3.
The final fix needs to https://github.com/lz4/lz4/pull/648 to be propagated into the stable release.
Author: Areg Melik-Adamyan <ar...@intel.com>
Author: Areg Melik-Adamyan <ar...@users.noreply.github.com>
Closes #3585 from aregm/ARROW-4462 and squashes the following commits:
966e1bf53 <Areg Melik-Adamyan> Delete lz4_msbuild_gl_runtimelibrary_params.patch
73a1c4637 <Areg Melik-Adamyan> ARROW-4462: Upgrade LZ4 v1.7.5 to v1.8.3 to compile with VS2017
629d1212c <Areg Melik-Adamyan> Update versions.txt
---
.../lz4_msbuild_gl_runtimelibrary_params.patch | 601 ---------------------
cpp/cmake_modules/ThirdpartyToolchain.cmake | 1 -
cpp/thirdparty/versions.txt | 2 +-
3 files changed, 1 insertion(+), 603 deletions(-)
diff --git a/cpp/build-support/lz4_msbuild_gl_runtimelibrary_params.patch b/cpp/build-support/lz4_msbuild_gl_runtimelibrary_params.patch
deleted file mode 100644
index c79898d..0000000
--- a/cpp/build-support/lz4_msbuild_gl_runtimelibrary_params.patch
+++ /dev/null
@@ -1,601 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-diff --git a/visual/VS2010/datagen/datagen.vcxproj b/visual/VS2010/datagen/datagen.vcxproj
-index aaf81ad..096741a 100644
---- a/visual/VS2010/datagen/datagen.vcxproj
-+++ b/visual/VS2010/datagen/datagen.vcxproj
-@@ -39,15 +39,19 @@
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
-- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
-- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)|$(WholeProgramOptimization)'=='Release|Win32|true'" Label="Configuration">
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)|$(WholeProgramOptimization)'=='Release|x64|true'" Label="Configuration">
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
-@@ -113,6 +117,46 @@
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|Win32|MultiThreaded'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|Win32|MultiThreadedDebug'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|Win32|MultiThreadedDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|Win32|MultiThreadedDebugDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|x64|MultiThreaded'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|x64|MultiThreadedDebug'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|x64|MultiThreadedDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|x64|MultiThreadedDebugDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level4</WarningLevel>
-diff --git a/visual/VS2010/frametest/frametest.vcxproj b/visual/VS2010/frametest/frametest.vcxproj
-index 76d12c9..34ca686 100644
---- a/visual/VS2010/frametest/frametest.vcxproj
-+++ b/visual/VS2010/frametest/frametest.vcxproj
-@@ -39,15 +39,19 @@
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
-- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
-- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)|$(WholeProgramOptimization)'=='Release|Win32|true'" Label="Configuration">
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)|$(WholeProgramOptimization)'=='Release|x64|true'" Label="Configuration">
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
-@@ -113,6 +117,46 @@
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|Win32|MultiThreaded'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|Win32|MultiThreadedDebug'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|Win32|MultiThreadedDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|Win32|MultiThreadedDebugDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|x64|MultiThreaded'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|x64|MultiThreadedDebug'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|x64|MultiThreadedDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|x64|MultiThreadedDebugDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level4</WarningLevel>
-diff --git a/visual/VS2010/fullbench-dll/fullbench-dll.vcxproj b/visual/VS2010/fullbench-dll/fullbench-dll.vcxproj
-index c10552a..c1ca231 100644
---- a/visual/VS2010/fullbench-dll/fullbench-dll.vcxproj
-+++ b/visual/VS2010/fullbench-dll/fullbench-dll.vcxproj
-@@ -39,15 +39,19 @@
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
-- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
-- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)|$(WholeProgramOptimization)'=='Release|Win32|true'" Label="Configuration">
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)|$(WholeProgramOptimization)'=='Release|x64|true'" Label="Configuration">
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
-@@ -117,6 +121,46 @@
- <AdditionalDependencies>liblz4.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|Win32|MultiThreaded'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|Win32|MultiThreadedDebug'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|Win32|MultiThreadedDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|Win32|MultiThreadedDebugDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|x64|MultiThreaded'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|x64|MultiThreadedDebug'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|x64|MultiThreadedDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|x64|MultiThreadedDebugDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level4</WarningLevel>
-diff --git a/visual/VS2010/fullbench/fullbench.vcxproj b/visual/VS2010/fullbench/fullbench.vcxproj
-index e2d95c9..613ff3c 100644
---- a/visual/VS2010/fullbench/fullbench.vcxproj
-+++ b/visual/VS2010/fullbench/fullbench.vcxproj
-@@ -39,15 +39,19 @@
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
-- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
-- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)|$(WholeProgramOptimization)'=='Release|Win32|true'" Label="Configuration">
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)|$(WholeProgramOptimization)'=='Release|x64|true'" Label="Configuration">
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
-@@ -113,6 +117,46 @@
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|Win32|MultiThreaded'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|Win32|MultiThreadedDebug'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|Win32|MultiThreadedDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|Win32|MultiThreadedDebugDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|x64|MultiThreaded'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|x64|MultiThreadedDebug'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|x64|MultiThreadedDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|x64|MultiThreadedDebugDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level4</WarningLevel>
-diff --git a/visual/VS2010/fuzzer/fuzzer.vcxproj b/visual/VS2010/fuzzer/fuzzer.vcxproj
-index 85d6c9b..be8b9a1 100644
---- a/visual/VS2010/fuzzer/fuzzer.vcxproj
-+++ b/visual/VS2010/fuzzer/fuzzer.vcxproj
-@@ -39,15 +39,19 @@
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
-- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
-- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)|$(WholeProgramOptimization)'=='Release|Win32|true'" Label="Configuration">
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)|$(WholeProgramOptimization)'=='Release|x64|true'" Label="Configuration">
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
-@@ -113,6 +117,46 @@
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|Win32|MultiThreaded'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|Win32|MultiThreadedDebug'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|Win32|MultiThreadedDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|Win32|MultiThreadedDebugDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|x64|MultiThreaded'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|x64|MultiThreadedDebug'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|x64|MultiThreadedDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|x64|MultiThreadedDebugDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level4</WarningLevel>
-diff --git a/visual/VS2010/liblz4-dll/liblz4-dll.vcxproj b/visual/VS2010/liblz4-dll/liblz4-dll.vcxproj
-index 389f13c..e30e667 100644
---- a/visual/VS2010/liblz4-dll/liblz4-dll.vcxproj
-+++ b/visual/VS2010/liblz4-dll/liblz4-dll.vcxproj
-@@ -40,15 +40,19 @@
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
-- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
-- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)|$(WholeProgramOptimization)'=='Release|Win32|true'" Label="Configuration">
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)|$(WholeProgramOptimization)'=='Release|x64|true'" Label="Configuration">
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
-@@ -116,6 +120,46 @@
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|Win32|MultiThreaded'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|Win32|MultiThreadedDebug'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|Win32|MultiThreadedDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|Win32|MultiThreadedDebugDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|x64|MultiThreaded'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|x64|MultiThreadedDebug'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|x64|MultiThreadedDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|x64|MultiThreadedDebugDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level4</WarningLevel>
-diff --git a/visual/VS2010/liblz4/liblz4.vcxproj b/visual/VS2010/liblz4/liblz4.vcxproj
-index a0b8000..38d2ce2 100644
---- a/visual/VS2010/liblz4/liblz4.vcxproj
-+++ b/visual/VS2010/liblz4/liblz4.vcxproj
-@@ -39,15 +39,19 @@
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
-- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
-- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)|$(WholeProgramOptimization)'=='Release|Win32|true'" Label="Configuration">
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)|$(WholeProgramOptimization)'=='Release|x64|true'" Label="Configuration">
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
-@@ -115,6 +119,46 @@
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|Win32|MultiThreaded'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|Win32|MultiThreadedDebug'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|Win32|MultiThreadedDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|Win32|MultiThreadedDebugDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|x64|MultiThreaded'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|x64|MultiThreadedDebug'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|x64|MultiThreadedDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|x64|MultiThreadedDebugDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level4</WarningLevel>
-diff --git a/visual/VS2010/lz4/lz4.vcxproj b/visual/VS2010/lz4/lz4.vcxproj
-index 693e121..9eb005b 100644
---- a/visual/VS2010/lz4/lz4.vcxproj
-+++ b/visual/VS2010/lz4/lz4.vcxproj
-@@ -39,15 +39,19 @@
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
-- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
-- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)|$(WholeProgramOptimization)'=='Release|Win32|true'" Label="Configuration">
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)|$(WholeProgramOptimization)'=='Release|x64|true'" Label="Configuration">
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
-@@ -115,6 +119,46 @@
- <AdditionalDependencies>setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|Win32|MultiThreaded'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|Win32|MultiThreadedDebug'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|Win32|MultiThreadedDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|Win32|MultiThreadedDebugDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|x64|MultiThreaded'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|x64|MultiThreadedDebug'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Release|x64|MultiThreadedDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)|$(RuntimeLibrary)'=='Debug|x64|MultiThreadedDebugDLL'" Label="Configuration">
-+ <ClCompile>
-+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+ </ClCompile>
-+ </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level4</WarningLevel>
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index e8ec739..5cfc95d 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -1153,7 +1153,6 @@ if (ARROW_WITH_LZ4)
set(LZ4_STATIC_LIB "${LZ4_BUILD_DIR}/visual/VS2010/bin/x64_${CMAKE_BUILD_TYPE}/liblz4_static.lib")
set(LZ4_BUILD_COMMAND BUILD_COMMAND msbuild.exe /m /p:Configuration=${CMAKE_BUILD_TYPE} /p:Platform=x64 /p:PlatformToolset=v140
${LZ4_RUNTIME_LIBRARY_LINKAGE} /t:Build ${LZ4_BUILD_DIR}/visual/VS2010/lz4.sln)
- set(LZ4_PATCH_COMMAND PATCH_COMMAND git --git-dir=. apply --verbose --whitespace=fix ${CMAKE_SOURCE_DIR}/build-support/lz4_msbuild_gl_runtimelibrary_params.patch)
else()
set(LZ4_STATIC_LIB "${LZ4_BUILD_DIR}/lib/liblz4.a")
set(LZ4_BUILD_COMMAND BUILD_COMMAND ${CMAKE_SOURCE_DIR}/build-support/build-lz4-lib.sh "AR=${CMAKE_AR}")
diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt
index e62a37b..37f53c7 100644
--- a/cpp/thirdparty/versions.txt
+++ b/cpp/thirdparty/versions.txt
@@ -34,7 +34,7 @@ GLOG_VERSION=v0.3.5
GRPC_VERSION=v1.18.0
GTEST_VERSION=1.8.0
JEMALLOC_VERSION=17c897976c60b0e6e4f4a365c751027244dada7a
-LZ4_VERSION=v1.7.5
+LZ4_VERSION=v1.8.3
ORC_VERSION=1.5.4
PROTOBUF_VERSION=v3.6.1
RAPIDJSON_VERSION=v1.1.0