summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-01-26 21:30:34 +0100
committerSergei Golubchik <serg@mariadb.org>2015-02-10 10:21:16 +0100
commit01963e5df10eb1439f3b71541832e77dd4e80c64 (patch)
tree9c517df2cefcaa88ba51a153591f1c4d2dcd38a0
parent83c0866082cd630cada815add97bbf2d09ac8ab3 (diff)
downloadmariadb-git-01963e5df10eb1439f3b71541832e77dd4e80c64.tar.gz
fix for cmake builds on windows
-rw-r--r--win/packaging/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/win/packaging/CMakeLists.txt b/win/packaging/CMakeLists.txt
index 95547ac9f3a..9d25f70c61a 100644
--- a/win/packaging/CMakeLists.txt
+++ b/win/packaging/CMakeLists.txt
@@ -30,10 +30,10 @@ FIND_PATH(WIX_DIR heat.exe
SET(CPACK_WIX_PACKAGE_BASE_NAME "MariaDB")
IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
SET(CPACK_WIX_UPGRADE_CODE "49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3")
- SET(CPACK_WIX_PACKAGE_NAME "MariaDB @MAJOR_VERSION@.@MINOR_VERSION@")
+ SET(CPACK_WIX_PACKAGE_NAME "MariaDB ${MAJOR_VERSION}.${MINOR_VERSION}")
ELSE()
SET(CPACK_WIX_UPGRADE_CODE "2331E7BD-EE58-431B-9E18-B2B918BCEB1B")
- SET(CPACK_WIX_PACKAGE_NAME "MariaDB @MAJOR_VERSION@.@MINOR_VERSION@ (x64)")
+ SET(CPACK_WIX_PACKAGE_NAME "MariaDB ${MAJOR_VERSION}.${MINOR_VERSION} (x64)")
ENDIF()