mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a problem building MSI using localized (Spanish) Visual Studio 2010.

Browse source 
VS did not like to execute 2 commands in custom build step, workaround is 
to use single COMMAND instead of 2.
This commit is contained in:
Vladislav Vaintroub 2011-06-08 16:56:35 +02:00
parent 835393a448
commit c0f2f1f1f6
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
win/packaging/CMakeLists.txt
View file

@ -157,7 +157,6 @@ ENDIF()
ADD_CUSTOM_TARGET( ADD_CUSTOM_TARGET(
MSI MSI
COMMAND set VS_UNICODE_OUTPUT=
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
${CONFIG_PARAM} ${CONFIG_PARAM}
-P ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake -P ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake
@ -166,7 +165,6 @@ ADD_DEPENDENCIES(MSI wixca)
ADD_CUSTOM_TARGET( ADD_CUSTOM_TARGET(
MSI_ESSENTIALS MSI_ESSENTIALS
COMMAND set VS_UNICODE_OUTPUT=
COMMAND ${CMAKE_COMMAND} -DESSENTIALS=1 COMMAND ${CMAKE_COMMAND} -DESSENTIALS=1
${CONFIG_PARAM} ${CONFIG_PARAM}
-P ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake -P ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake

2
win/packaging/create_msi.cmake.in
View file

@ -28,7 +28,7 @@ SET(THIRD_PARTY_DOWNLOAD_LOCATION "@THIRD_PARTY_DOWNLOAD_LOCATION@")
SET(THIRD_PARTY_FEATURE_CONDITION "@THIRD_PARTY_FEATURE_CONDITION@") SET(THIRD_PARTY_FEATURE_CONDITION "@THIRD_PARTY_FEATURE_CONDITION@")
SET(LIBMYSQL_LOCATION "@LIBMYSQL_LOCATION@") SET(LIBMYSQL_LOCATION "@LIBMYSQL_LOCATION@")
SET($ENV{VS_UNICODE_OUTPUT} "")
IF(LIBMYSQL_LOCATION AND CMAKE_CFG_INTDIR) IF(LIBMYSQL_LOCATION AND CMAKE_CFG_INTDIR)
# resolve libmysql full path # resolve libmysql full path
STRING(REPLACE "${CMAKE_CFG_INTDIR}" "${CMAKE_INSTALL_CONFIG_NAME}" LIBMYSQL_LOCATION "${LIBMYSQL_LOCATION}") STRING(REPLACE "${CMAKE_CFG_INTDIR}" "${CMAKE_INSTALL_CONFIG_NAME}" LIBMYSQL_LOCATION "${LIBMYSQL_LOCATION}")