diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-09-18 18:39:08 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-09-18 18:39:08 +0200 |
| commit | 9c6405fefaf7311b31591ab445660e8f34d64295 (patch) | |
| tree | 87aa09ef6a2f9d33d2d19ef56d3e76e57114d361 /win | |
| parent | f4fe138321092c8dcd02caf22bdbad9698ee6829 (diff) | |
| parent | 79140b03839a6b46a92736bd2ce03cefd43a5058 (diff) | |
| download | mariadb-git-9c6405fefaf7311b31591ab445660e8f34d64295.tar.gz | |
Commit resolved conflicts
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | win/packaging/CPackWixConfig.cmake | 1 | ||||
| -rw-r--r-- | win/packaging/ca/CMakeLists.txt | 6 |
3 files changed, 6 insertions, 2 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/CPackWixConfig.cmake b/win/packaging/CPackWixConfig.cmake index 474c207891c..58a2ef44eef 100644 --- a/win/packaging/CPackWixConfig.cmake +++ b/win/packaging/CPackWixConfig.cmake @@ -68,7 +68,6 @@ SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DESCRIPTION "Install server") SET(CPACK_COMPONENT_CONNECT-ENGINE_DESCRIPTION "Server data files" ) SET(CPACK_COMPONENT_CONNECT-ENGINE_HIDDEN 1) - #Feature "Devel" SET(CPACK_COMPONENT_GROUP_DEVEL_DISPLAY_NAME "Development Components") SET(CPACK_COMPONENT_GROUP_DEVEL_DESCRIPTION "Installs C/C++ header files and libraries") 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} |