From 638ee1af4a954e8055ac2fcd3166596d680506fe Mon Sep 17 00:00:00 2001 From: ctrlaltca Date: Mon, 12 Nov 2018 18:50:38 +0100 Subject: [PATCH] This should fix appveyor compilation (#3434) --- cmake/FindVCredistRuntime.cmake | 2 +- cmake/NSIS.template.in | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/FindVCredistRuntime.cmake b/cmake/FindVCredistRuntime.cmake index 2786315f..9c3d335b 100644 --- a/cmake/FindVCredistRuntime.cmake +++ b/cmake/FindVCredistRuntime.cmake @@ -9,7 +9,7 @@ if (WIN32) set(REDIST_ARCH x86) endif() - set(REDIST_FILE vc_redist.${REDIST_ARCH}.exe) + set(REDIST_FILE vcredist_${REDIST_ARCH}.exe) set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE) include(InstallRequiredSystemLibraries) diff --git a/cmake/NSIS.template.in b/cmake/NSIS.template.in index 9373c6cd..fdc01520 100644 --- a/cmake/NSIS.template.in +++ b/cmake/NSIS.template.in @@ -247,20 +247,20 @@ ${If} $PortableMode = 0 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "VersionMajor" "@CPACK_PACKAGE_VERSION_MAJOR@" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "VersionMinor" "@CPACK_PACKAGE_VERSION_MINOR@" - IfFileExists "$INSTDIR\vc_redist.x86.exe" VcRedist86Exists PastVcRedist86Check + IfFileExists "$INSTDIR\vcredist_x86.exe" VcRedist86Exists PastVcRedist86Check VcRedist86Exists: - ExecWait '"$INSTDIR\vc_redist.x86.exe" /passive /norestart' + ExecWait '"$INSTDIR\vcredist_x86.exe" /passive /norestart' DetailPrint "Sleep to ensure unlock of vc_redist file after installation..." Sleep 3000 - Delete "$INSTDIR\vc_redist.x86.exe" + Delete "$INSTDIR\vcredist_x86.exe" PastVcRedist86Check: - IfFileExists "$INSTDIR\vc_redist.x64.exe" VcRedist64Exists PastVcRedist64Check + IfFileExists "$INSTDIR\vcredist_x64.exe" VcRedist64Exists PastVcRedist64Check VcRedist64Exists: - ExecWait '"$INSTDIR\vc_redist.x64.exe" /passive /norestart' + ExecWait '"$INSTDIR\vcredist_x64.exe" /passive /norestart' DetailPrint "Sleep to ensure unlock of vc_redist file after installation..." Sleep 3000 - Delete "$INSTDIR\vc_redist.x64.exe" + Delete "$INSTDIR\vcredist_x64.exe" PastVcRedist64Check: ${Else}