diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-09-03 12:58:41 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-09-03 12:58:41 +0200 |
| commit | 530a6e74819ec14b5fdc42aa588b236ecb9f2fcd (patch) | |
| tree | a4d45b1fd0e434c23577507364fa443226676eb5 /win | |
| parent | 5088cbf4ed7224698678f3eaf406361c6e7db4b8 (diff) | |
| parent | 4b41e3c7f33714186c97a6cc2e6d3bb93b050c61 (diff) | |
| download | mariadb-git-530a6e74819ec14b5fdc42aa588b236ecb9f2fcd.tar.gz | |
Merge branch '10.0' into 10.1
referenced_by_foreign_key2(), needed for InnoDB to compile,
was taken from 10.0-galera
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | win/packaging/ca/CMakeLists.txt | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/win/packaging/CMakeLists.txt b/win/packaging/CMakeLists.txt index 9d25f70c61a..33c6cffe323 100644 --- a/win/packaging/CMakeLists.txt +++ b/win/packaging/CMakeLists.txt @@ -24,6 +24,7 @@ FIND_PATH(WIX_DIR heat.exe "$ENV{ProgramFiles}/Windows Installer XML v3/bin" "$ENV{ProgramFiles}/Windows Installer XML v3.5/bin" "$ENV{ProgramFiles}/Windows Installer XML v3.6/bin" + "$ENV{ProgramFiles}/WiX Toolset v3.9/bin" "$ENV{WIX}/bin" ) diff --git a/win/packaging/ca/CMakeLists.txt b/win/packaging/ca/CMakeLists.txt index 0da1e5d67b1..ccd03130d69 100644 --- a/win/packaging/ca/CMakeLists.txt +++ b/win/packaging/ca/CMakeLists.txt @@ -36,6 +36,9 @@ ELSEIF(MSVC_VERSION EQUAL 1500) ELSEIF(MSVC_VERSION EQUAL 1600 OR MSVC_VERSION EQUAL 1700 ) SET(WIX35_MSVC_SUFFIX "_2010") SET(WIX36_MSVC_SUFFIX "VS2010") +ELSEIF(MSVC_VERSION EQUAL 1800 OR MSVC_VERSION EQUAL 1900 ) + SET(WIX35_MSVC_SUFFIX "_2013") + SET(WIX36_MSVC_SUFFIX "VS2013") ELSE() # When next VS is out, add the correct version here MESSAGE(FATAL_ERROR "Unknown VS version") @@ -47,7 +50,8 @@ FIND_LIBRARY(WIX_WCAUTIL_LIBRARY wcautil PATHS ${WIX_DIR}/../SDK/lib - ${WIX_DIR}/../SDK/${WIX36_MSVC_SUFFIX}/lib/${WIX36_ARCH_SUFFIX}) + ${WIX_DIR}/../SDK/${WIX36_MSVC_SUFFIX}/lib/${WIX36_ARCH_SUFFIX} + ) FIND_LIBRARY(WIX_DUTIL_LIBRARY NAMES dutil${WIX_ARCH_SUFFIX} dutil${WIX35_MSVC_SUFFIX}${WIX_ARCH_SUFFIX} |