diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-02 17:46:22 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-02 17:46:22 +0300 |
| commit | e82fe21e3ac3141c92b7c4fb2d1fc3c083d834e8 (patch) | |
| tree | 3ecf4329b6a623165aa6cb392ae71998de50c89e /win/packaging | |
| parent | 709f0510e32981c59d7353e55a564073939db770 (diff) | |
| parent | 7f1e1309bbd54a7923cf33a37938a29171ca0993 (diff) | |
| download | mariadb-git-e82fe21e3ac3141c92b7c4fb2d1fc3c083d834e8.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'win/packaging')
| -rw-r--r-- | win/packaging/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win/packaging/CMakeLists.txt b/win/packaging/CMakeLists.txt index 0a1719a9ad5..474d1350ad9 100644 --- a/win/packaging/CMakeLists.txt +++ b/win/packaging/CMakeLists.txt @@ -259,8 +259,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} ) |