diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-05 18:05:22 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-05 18:05:22 +0300 |
commit | 68d9d512e933a1d40670add50f205e5266bc5507 (patch) | |
tree | 24f483a40449b28b4414360fbdd03646315ac1ec /win | |
parent | 6404645980db51fdc1e5dae2ac94eca57804284b (diff) | |
parent | 286e52e948eee9e5f908c5944467149df35d25e7 (diff) | |
download | mariadb-git-68d9d512e933a1d40670add50f205e5266bc5507.tar.gz |
Merge 10.3 into 10.4
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 a7168cbe85d..3b871fe0a72 100644 --- a/win/packaging/CMakeLists.txt +++ b/win/packaging/CMakeLists.txt @@ -260,10 +260,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) + |