diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-05 20:36:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-05 20:36:43 +0300 |
| commit | 6877ef9a7c9c7ee55d67e4baaf4e8f7b874c9f89 (patch) | |
| tree | ade4c0b2e50538438e70dc49581541de94098625 /win | |
| parent | 374f94c5a749ec6af83824c1f55f0f49029a9714 (diff) | |
| parent | 68d9d512e933a1d40670add50f205e5266bc5507 (diff) | |
| download | mariadb-git-6877ef9a7c9c7ee55d67e4baaf4e8f7b874c9f89.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/CMakeLists.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/win/packaging/CMakeLists.txt b/win/packaging/CMakeLists.txt index 7b26289c0e7..89c6db9ab6f 100644 --- a/win/packaging/CMakeLists.txt +++ b/win/packaging/CMakeLists.txt @@ -223,10 +223,17 @@ IF(SIGNCODE) ENDIF() ADD_CUSTOM_TARGET( - win_package + win_package_zip ${SIGN_COMMAND} COMMAND ${CMAKE_CPACK_COMMAND} ${CPACK_CONFIG_PARAM} --config ${CMAKE_CURRENT_SOURCE_DIR}/CPackZipConfig.cmake + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} +) + +ADD_CUSTOM_TARGET( + win_package_debuginfo COMMAND ${CMAKE_CPACK_COMMAND} ${CPACK_CONFIG_PARAM} --config ${CMAKE_CURRENT_SOURCE_DIR}/CPackZipDebugInfoConfig.cmake WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) +ADD_CUSTOM_TARGET(win_package DEPENDS win_package_zip win_package_debuginfo) + |