summaryrefslogtreecommitdiff
path: root/win/upgrade_wizard
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-07-06 04:03:58 +0200
committerSergei Golubchik <serg@mariadb.org>2018-08-12 11:37:42 +0200
commit6b53f9d781cc19cbec96c3eb048e6407021685a2 (patch)
tree71379cc76e9f8294ccabca3a40ed2e7d509c7c5a /win/upgrade_wizard
parent96b8909062c0b4df654f11057905b1e31398f88f (diff)
downloadmariadb-git-6b53f9d781cc19cbec96c3eb048e6407021685a2.tar.gz
MDEV-16662 CMake warnings: CMP0026
Diffstat (limited to 'win/upgrade_wizard')
-rw-r--r--win/upgrade_wizard/CMakeLists.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/win/upgrade_wizard/CMakeLists.txt b/win/upgrade_wizard/CMakeLists.txt
index 81c9c0d572c..f4148ee98d2 100644
--- a/win/upgrade_wizard/CMakeLists.txt
+++ b/win/upgrade_wizard/CMakeLists.txt
@@ -46,9 +46,8 @@ SET_TARGET_PROPERTIES(mysql_upgrade_wizard PROPERTIES WIN32_EXECUTABLE 1)
# 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 mysql_upgrade_wizard LOCATION)
ADD_CUSTOM_COMMAND(
TARGET mysql_upgrade_wizard POST_BUILD
COMMAND mt.exe -manifest ${CMAKE_CURRENT_SOURCE_DIR}/upgrade_wizard.exe.manifest
- "-outputresource:${upgrade_wizard_location};#1"
+ "-outputresource:$<TARGET_FILE:mysql_upgrade_wizard>;#1"
)