summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2012-08-24 15:30:05 +0200
committerVladislav Vaintroub <wlad@montyprogram.com>2012-08-24 15:30:05 +0200
commitf024e0d5e9232426a96434efe374a879c0df783f (patch)
tree6e92f91591d7b42f92ad5eb386254bc48d61db01 /win
parent89e4d23f3b3984abe0f29adb8c024a105d3b5d49 (diff)
downloadmariadb-git-f024e0d5e9232426a96434efe374a879c0df783f.tar.gz
MDEV-484 : allow compilation/packaging on Windows with newly released VS2012
Diffstat (limited to 'win')
-rw-r--r--win/packaging/ca/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/win/packaging/ca/CMakeLists.txt b/win/packaging/ca/CMakeLists.txt
index 940e9e3a7d1..0da1e5d67b1 100644
--- a/win/packaging/ca/CMakeLists.txt
+++ b/win/packaging/ca/CMakeLists.txt
@@ -33,7 +33,7 @@ IF(MSVC_VERSION EQUAL 1400)
ELSEIF(MSVC_VERSION EQUAL 1500)
SET(WIX35_MSVC_SUFFIX "_2008")
SET(WIX36_MSVC_SUFFIX "VS2008")
-ELSEIF(MSVC_VERSION EQUAL 1600)
+ELSEIF(MSVC_VERSION EQUAL 1600 OR MSVC_VERSION EQUAL 1700 )
SET(WIX35_MSVC_SUFFIX "_2010")
SET(WIX36_MSVC_SUFFIX "VS2010")
ELSE()