summaryrefslogtreecommitdiff
path: root/win/packaging/CMakeLists.txt
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/packaging/CMakeLists.txt
parent96b8909062c0b4df654f11057905b1e31398f88f (diff)
downloadmariadb-git-6b53f9d781cc19cbec96c3eb048e6407021685a2.tar.gz
MDEV-16662 CMake warnings: CMP0026
Diffstat (limited to 'win/packaging/CMakeLists.txt')
-rw-r--r--win/packaging/CMakeLists.txt73
1 files changed, 59 insertions, 14 deletions
diff --git a/win/packaging/CMakeLists.txt b/win/packaging/CMakeLists.txt
index d5dc3becba8..61bfe9e5568 100644
--- a/win/packaging/CMakeLists.txt
+++ b/win/packaging/CMakeLists.txt
@@ -123,11 +123,9 @@ ELSE()
FILE(APPEND "${CMAKE_CURRENT_BINARY_DIR}/COPYING.rtf" "\n}\n")
SET(COPYING_RTF "${CMAKE_CURRENT_BINARY_DIR}/COPYING.rtf")
ENDIF()
-GET_TARGET_PROPERTY(WIXCA_LOCATION wixca LOCATION)
SET(CPACK_WIX_CONFIG ${CMAKE_CURRENT_SOURCE_DIR}/CPackWixConfig.cmake)
-GET_TARGET_PROPERTY(upgrade_wizard_location mysql_upgrade_wizard LOCATION)
-IF(NOT upgrade_wizard_location)
+IF(NOT TARGET mysql_upgrade_wizard)
SET(EXTRA_WIX_PREPROCESSOR_FLAGS "-dHaveUpgradeWizard=0")
ENDIF()
IF(WITH_INNOBASE_STORAGE_ENGINE)
@@ -145,7 +143,6 @@ IF(WITH_THIRD_PARTY)
ENDIF()
ENDIF()
-GET_TARGET_PROPERTY(LIBMYSQL_LOCATION libmysql LOCATION)
FOREACH(third_party ${WITH_THIRD_PARTY})
SET(third_party_install_plugin ${CMAKE_CURRENT_SOURCE_DIR}/${third_party}.cmake)
IF(NOT EXISTS ${third_party_install_plugin})
@@ -169,10 +166,6 @@ ENDIF()
IF(NOT CPACK_WIX_UI)
SET(CPACK_WIX_UI "MyWixUI_Mondo")
ENDIF()
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/create_msi.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake
- @ONLY)
-
IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(WixWin64 " Win64='yes'")
@@ -188,17 +181,69 @@ ENDIF()
ADD_CUSTOM_TARGET(
MSI
- COMMAND ${CMAKE_COMMAND}
- ${CONFIG_PARAM}
- -P ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake
+ COMMAND ${CMAKE_COMMAND} ${CONFIG_PARAM}
+ -DCANDLE_EXECUTABLE="${CANDLE_EXECUTABLE}"
+ -DCMAKE_CFG_INTDIR="${CMAKE_CFG_INTDIR}"
+ -DCMAKE_FULL_VER="${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}"
+ -DCMAKE_SIZEOF_VOID_P=${CMAKE_SIZEOF_VOID_P}
+ -DCOPYING_RTF="${COPYING_RTF}"
+ -DCPACK_WIX_CONFIG="${CPACK_WIX_CONFIG}"
+ -DCPACK_WIX_INCLUDE="${CPACK_WIX_INCLUDE}"
+ -DCPACK_WIX_PACKAGE_BASE_NAME="${CPACK_WIX_PACKAGE_BASE_NAME}"
+ -DCPACK_WIX_PACKAGE_NAME="${CPACK_WIX_PACKAGE_NAME}"
+ -DCPACK_WIX_UPGRADE_CODE="${CPACK_WIX_UPGRADE_CODE}"
+ -DEXTRA_WIX_PREPROCESSOR_FLAGS="${EXTRA_WIX_PREPROCESSOR_FLAGS}"
+ -DLIGHT_EXECUTABLE="${LIGHT_EXECUTABLE}"
+ -DMAJOR_VERSION="${MAJOR_VERSION}"
+ -DMANUFACTURER="${MANUFACTURER}"
+ -DMINOR_VERSION="${MINOR_VERSION}"
+ -DPATCH_VERSION="${PATCH_VERSION}"
+ -DSIGNCODE="${SIGNCODE}"
+ -DSIGNTOOL_EXECUTABLE="${SIGNTOOL_EXECUTABLE}"
+ -DSIGNTOOL_PARAMETERS="${SIGNTOOL_PARAMETERS}"
+ -DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}"
+ -DTHIRD_PARTY_DOWNLOAD_LOCATION="${THIRD_PARTY_DOWNLOAD_LOCATION}"
+ -DTHIRD_PARTY_FEATURE_CONDITION="${THIRD_PARTY_FEATURE_CONDITION}"
+ -DTINY_VERSION="${TINY_VERSION}"
+ -DTOP_BINDIR="${CMAKE_BINARY_DIR}"
+ -DVERSION="${VERSION}"
+ -DWITH_THIRD_PARTY="${WITH_THIRD_PARTY}"
+ -DWIXCA_LOCATION="$<TARGET_FILE:wixca>"
+ -P ${CMAKE_CURRENT_SOURCE_DIR}/create_msi.cmake
)
ADD_DEPENDENCIES(MSI wixca)
ADD_CUSTOM_TARGET(
MSI_ESSENTIALS
- COMMAND ${CMAKE_COMMAND} -DESSENTIALS=1
- ${CONFIG_PARAM}
- -P ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake
+ COMMAND ${CMAKE_COMMAND} ${CONFIG_PARAM} -DESSENTIALS=1
+ -DCANDLE_EXECUTABLE="${CANDLE_EXECUTABLE}"
+ -DCMAKE_CFG_INTDIR="${CMAKE_CFG_INTDIR}"
+ -DCMAKE_FULL_VER="${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}"
+ -DCMAKE_SIZEOF_VOID_P=${CMAKE_SIZEOF_VOID_P}
+ -DCOPYING_RTF="${COPYING_RTF}"
+ -DCPACK_WIX_CONFIG="${CPACK_WIX_CONFIG}"
+ -DCPACK_WIX_INCLUDE="${CPACK_WIX_INCLUDE}"
+ -DCPACK_WIX_PACKAGE_BASE_NAME="${CPACK_WIX_PACKAGE_BASE_NAME}"
+ -DCPACK_WIX_PACKAGE_NAME="${CPACK_WIX_PACKAGE_NAME}"
+ -DCPACK_WIX_UPGRADE_CODE="${CPACK_WIX_UPGRADE_CODE}"
+ -DEXTRA_WIX_PREPROCESSOR_FLAGS="${EXTRA_WIX_PREPROCESSOR_FLAGS}"
+ -DLIGHT_EXECUTABLE="${LIGHT_EXECUTABLE}"
+ -DMAJOR_VERSION="${MAJOR_VERSION}"
+ -DMANUFACTURER="${MANUFACTURER}"
+ -DMINOR_VERSION="${MINOR_VERSION}"
+ -DPATCH_VERSION="${PATCH_VERSION}"
+ -DSIGNCODE="${SIGNCODE}"
+ -DSIGNTOOL_EXECUTABLE="${SIGNTOOL_EXECUTABLE}"
+ -DSIGNTOOL_PARAMETERS="${SIGNTOOL_PARAMETERS}"
+ -DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}"
+ -DTHIRD_PARTY_DOWNLOAD_LOCATION="${THIRD_PARTY_DOWNLOAD_LOCATION}"
+ -DTHIRD_PARTY_FEATURE_CONDITION="${THIRD_PARTY_FEATURE_CONDITION}"
+ -DTINY_VERSION="${TINY_VERSION}"
+ -DTOP_BINDIR="${CMAKE_BINARY_DIR}"
+ -DVERSION="${VERSION}"
+ -DWITH_THIRD_PARTY="${WITH_THIRD_PARTY}"
+ -DWIXCA_LOCATION="$<TARGET_FILE:wixca>"
+ -P ${CMAKE_CURRENT_SOURCE_DIR}/create_msi.cmake
)
ADD_DEPENDENCIES(MSI_ESSENTIALS wixca)