diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-06-08 16:56:35 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-06-08 16:56:35 +0200 |
| commit | c0f2f1f1f6e59d7d160694021a0cb066509c6714 (patch) | |
| tree | 101c04985a7f9d0e10f267790d0439c27972c0d8 /win | |
| parent | 835393a4489ab2a05444a1b15c88d03df8ba574c (diff) | |
| download | mariadb-git-c0f2f1f1f6e59d7d160694021a0cb066509c6714.tar.gz | |
Fix a problem building MSI using localized (Spanish) Visual Studio 2010.
VS did not like to execute 2 commands in custom build step, workaround is
to use single COMMAND instead of 2.
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | win/packaging/create_msi.cmake.in | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/win/packaging/CMakeLists.txt b/win/packaging/CMakeLists.txt index 8cf4b3872da..795732e946b 100644 --- a/win/packaging/CMakeLists.txt +++ b/win/packaging/CMakeLists.txt @@ -157,7 +157,6 @@ ENDIF() ADD_CUSTOM_TARGET( MSI - COMMAND set VS_UNICODE_OUTPUT= COMMAND ${CMAKE_COMMAND} ${CONFIG_PARAM} -P ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake @@ -166,7 +165,6 @@ ADD_DEPENDENCIES(MSI wixca) ADD_CUSTOM_TARGET( MSI_ESSENTIALS - COMMAND set VS_UNICODE_OUTPUT= COMMAND ${CMAKE_COMMAND} -DESSENTIALS=1 ${CONFIG_PARAM} -P ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake diff --git a/win/packaging/create_msi.cmake.in b/win/packaging/create_msi.cmake.in index 7c218bbf407..d291d06161c 100644 --- a/win/packaging/create_msi.cmake.in +++ b/win/packaging/create_msi.cmake.in @@ -28,7 +28,7 @@ SET(THIRD_PARTY_DOWNLOAD_LOCATION "@THIRD_PARTY_DOWNLOAD_LOCATION@") SET(THIRD_PARTY_FEATURE_CONDITION "@THIRD_PARTY_FEATURE_CONDITION@") SET(LIBMYSQL_LOCATION "@LIBMYSQL_LOCATION@") - +SET($ENV{VS_UNICODE_OUTPUT} "") IF(LIBMYSQL_LOCATION AND CMAKE_CFG_INTDIR) # resolve libmysql full path STRING(REPLACE "${CMAKE_CFG_INTDIR}" "${CMAKE_INSTALL_CONFIG_NAME}" LIBMYSQL_LOCATION "${LIBMYSQL_LOCATION}") |