diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-08-24 15:39:34 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-08-24 15:39:34 +0200 |
| commit | f0906773833649a15a5efff3680982b160e58cd1 (patch) | |
| tree | a51e209576fca5eda8af1c5126d122dd08fda21a /win | |
| parent | 4092d08bb87ce3e68f450745538164a8749fbac5 (diff) | |
| parent | c64afe8d94f908381a5a2aae29db56667ef2d424 (diff) | |
| download | mariadb-git-f0906773833649a15a5efff3680982b160e58cd1.tar.gz | |
Merge from 5.2.
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/ca/CMakeLists.txt | 2 |
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() |