diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-05 16:51:26 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-05 16:51:26 +0300 |
commit | 680463a8d991389f4ea5942e87764137c55c0eb4 (patch) | |
tree | 427f8946aa9085c7f6346e1047144995cb7c459e /win | |
parent | 05693cf2149f8792863a32325090e789015286fc (diff) | |
parent | efc70da5fd0459ff44153529d13651741cc32bc4 (diff) | |
download | mariadb-git-680463a8d991389f4ea5942e87764137c55c0eb4.tar.gz |
Merge 10.2 into 10.3
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 474d1350ad9..3d0e8d9b3de 100644 --- a/win/packaging/CMakeLists.txt +++ b/win/packaging/CMakeLists.txt @@ -257,10 +257,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) + |