[Commits] Rev 3166: MDEV-484 : allow compilation/packaging on Windows with newly released VS2012 in file:///H:/bzr/5.2/

Vladislav Vaintroub wlad at montyprogram.com
Fri Aug 24 16:32:51 EEST 2012


At file:///H:/bzr/5.2/

------------------------------------------------------------
revno: 3166
revision-id: wlad at montyprogram.com-20120824133005-jtg8q5j82qvpiddh
parent: knielsen at knielsen-hq.org-20120824105719-rhirum4zh5c72438
committer: Vladislav Vaintroub <wlad at montyprogram.com>
branch nick: 5.2
timestamp: Fri 2012-08-24 15:30:05 +0200
message:
  MDEV-484 : allow compilation/packaging on Windows with newly released VS2012
-------------- next part --------------
=== modified file 'win/packaging/ca/CMakeLists.txt'
--- a/win/packaging/ca/CMakeLists.txt	2012-04-25 13:30:19 +0000
+++ b/win/packaging/ca/CMakeLists.txt	2012-08-24 13:30:05 +0000
@@ -33,7 +33,7 @@
 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()



More information about the commits mailing list