Skip to content

Commit

Permalink
specify MSVC installer path
Browse files Browse the repository at this point in the history
  • Loading branch information
js8544 committed Sep 24, 2022
1 parent 93af741 commit cba216f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 11 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions ci/appveyor-cpp-build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions cpp/src/gandiva/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit cba216f

Please sign in to comment.