diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-02-14 19:36:06 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-02-14 19:36:06 +0100 |
| commit | 3ec6533ac8e583c7bf6fd1c04ca5aef1a6950e46 (patch) | |
| tree | 7d756dfaa276036e81587765c61a7e0060f33d84 /win/upgrade_wizard | |
| parent | 577d02b17d0a9c6df7f9b943c69c246519362d88 (diff) | |
| download | mariadb-git-3ec6533ac8e583c7bf6fd1c04ca5aef1a6950e46.tar.gz | |
MWL#55 : address Philip's final review comments :
- rename upgrade_wizard.exe to mysql_upgrade_wizard.exe
- have shortcut to upgrade wizard in the menu folder
Diffstat (limited to 'win/upgrade_wizard')
| -rw-r--r-- | win/upgrade_wizard/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/win/upgrade_wizard/CMakeLists.txt b/win/upgrade_wizard/CMakeLists.txt index 2e15087de43..44d6249ea1e 100644 --- a/win/upgrade_wizard/CMakeLists.txt +++ b/win/upgrade_wizard/CMakeLists.txt @@ -24,21 +24,21 @@ SET(CMAKE_MFC_FLAG 1) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql) -MYSQL_ADD_EXECUTABLE(upgrade_wizard +MYSQL_ADD_EXECUTABLE(mysql_upgrade_wizard upgrade.cpp upgradeDlg.cpp upgrade.rc COMPONENT Server) -TARGET_LINK_LIBRARIES(upgrade_wizard winservice) +TARGET_LINK_LIBRARIES(mysql_upgrade_wizard winservice) # upgrade_wizard is Windows executable, set WIN32_EXECUTABLE so it does not # create a console. -SET_TARGET_PROPERTIES(upgrade_wizard PROPERTIES WIN32_EXECUTABLE 1) +SET_TARGET_PROPERTIES(mysql_upgrade_wizard PROPERTIES WIN32_EXECUTABLE 1) # Embed Vista "admin" manifest, since upgrade_wizard needs admin privileges # to change service configuration. Due to a CMake bug http://www.vtk.org/Bug/view.php?id=11171 # it is not possible currenly to do it with linker flags. Work around is to use # manifest tool mt.exe and embed the manifest post-build. -GET_TARGET_PROPERTY(upgrade_wizard_location upgrade_wizard LOCATION) +GET_TARGET_PROPERTY(upgrade_wizard_location mysql_upgrade_wizard LOCATION) ADD_CUSTOM_COMMAND( - TARGET upgrade_wizard POST_BUILD + TARGET mysql_upgrade_wizard POST_BUILD COMMAND mt.exe -manifest ${CMAKE_CURRENT_SOURCE_DIR}/upgrade_wizard.exe.manifest "-outputresource:${upgrade_wizard_location};#1" ) |