From cba216f2792574971913c2e267d871720156b358 Mon Sep 17 00:00:00 2001
From: Jin Shang <shangjin1997@gmail.com>
Date: Sat, 24 Sep 2022 10:19:57 +0000
Subject: [PATCH] specify MSVC installer path

---
 appveyor.yml                   |  2 +-
 ci/appveyor-cpp-build.bat      |  2 ++
 cpp/src/gandiva/CMakeLists.txt | 10 ----------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index b6ba6e6e1a487..f4071d7495a9d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,7 +36,7 @@ matrix:
 
 environment:
   global:
-    APPVEYOR_SAVE_CACHE_ON_ERROR: true
+    APPVEYOR_SAVE_CACHE_ON_ERROR: false
     MSVC_DEFAULT_OPTIONS: ON
 
     # Change the clcache dir to reset caches everywhere when a setting
diff --git a/ci/appveyor-cpp-build.bat b/ci/appveyor-cpp-build.bat
index 4b90e49257c5e..4768b5bc89b33 100644
--- a/ci/appveyor-cpp-build.bat
+++ b/ci/appveyor-cpp-build.bat
@@ -49,6 +49,8 @@ set ARROW_CXXFLAGS=/WX /MP
 mkdir cpp\build
 pushd cpp\build
 
+set VSINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\
+
 @rem XXX Without forcing CMAKE_CXX_COMPILER, CMake can re-run itself and
 @rem unfortunately switch from Release to Debug mode...
 @rem
diff --git a/cpp/src/gandiva/CMakeLists.txt b/cpp/src/gandiva/CMakeLists.txt
index 3bb4cb80f51bc..312ab84f65ee6 100644
--- a/cpp/src/gandiva/CMakeLists.txt
+++ b/cpp/src/gandiva/CMakeLists.txt
@@ -93,16 +93,6 @@ endif()
 set(GANDIVA_SHARED_LINK_LIBS arrow_shared LLVM::LLVM_HEADERS)
 set(GANDIVA_SHARED_PRIVATE_LINK_LIBS LLVM::LLVM_LIBS ${GANDIVA_OPENSSL_TARGETS}
                                      Boost::headers)
-if(MSVC)
-  set(MSVC_DIA_SDK_DIR "$ENV{VSINSTALLDIR}DIA SDK")
-  if(IS_DIRECTORY ${MSVC_DIA_SDK_DIR})
-    set(GANDIVA_DIA_GUIDS_LIB "${MSVC_DIA_SDK_DIR}/lib/amd64/diaguids.lib")
-    string(REGEX REPLACE "\\\\" "\\\\\\\\" GANDIVA_DIA_GUIDS_LIB_ESCAPED
-                         "${GANDIVA_DIA_GUIDS_LIB}")
-    list(APPEND GANDIVA_SHARED_PRIVATE_LINK_LIBS GANDIVA_DIA_GUIDS_LIB_ESCAPED)
-  endif()
-endif()
-
 set(GANDIVA_STATIC_LINK_LIBS
     arrow_static
     LLVM::LLVM_HEADERS