Merge branch '10.0' into 10.1

This commit is contained in:
Sergei Golubchik 2017-03-21 19:20:44 +01:00
commit 09a2107b1b
27 changed files with 184 additions and 588 deletions

View file

@ -51,7 +51,7 @@ IF(MSVC_VERSION EQUAL 1600 OR MSVC_VERSION EQUAL 1700 )
SET(WIX_MSVC_SUFFIX "VS2010")
ELSEIF(MSVC_VERSION EQUAL 1800)
SET(WIX_MSVC_SUFFIX "VS2013")
ELSEIF (MSVC_VERSION EQUAL 1900)
ELSE()
SET(WIX_MSVC_SUFFIX "VS2015")
ENDIF()