summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-07-02 21:44:58 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-07-02 21:44:58 +0300
commit7a3d34d6456ed719da62a896e5ac6e983b72f3d8 (patch)
tree38dc1133cd53a366e7a851cfba6dad1269dcd5a1 /win
parentfaeaf978b8c1deaa61d7d408fa6cb4ed03bfcfa3 (diff)
parent1d45b3b055511d58c1e820ad497793f30871586e (diff)
downloadmariadb-git-7a3d34d6456ed719da62a896e5ac6e983b72f3d8.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'win')
-rw-r--r--win/packaging/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/win/packaging/CMakeLists.txt b/win/packaging/CMakeLists.txt
index b4ff20b773d..9e06638a991 100644
--- a/win/packaging/CMakeLists.txt
+++ b/win/packaging/CMakeLists.txt
@@ -260,8 +260,8 @@ ENDIF()
ADD_CUSTOM_TARGET(
win_package
${SIGN_COMMAND}
- COMMAND cpack ${CPACK_CONFIG_PARAM} --config ${CMAKE_CURRENT_SOURCE_DIR}/CPackZipConfig.cmake
- COMMAND cpack ${CPACK_CONFIG_PARAM} --config ${CMAKE_CURRENT_SOURCE_DIR}/CPackZipDebugInfoConfig.cmake
+ COMMAND ${CMAKE_CPACK_COMMAND} ${CPACK_CONFIG_PARAM} --config ${CMAKE_CURRENT_SOURCE_DIR}/CPackZipConfig.cmake
+ COMMAND ${CMAKE_CPACK_COMMAND} ${CPACK_CONFIG_PARAM} --config ${CMAKE_CURRENT_SOURCE_DIR}/CPackZipDebugInfoConfig.cmake
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)