diff options
| author | Vicențiu Ciorbaru <cvicentiu@gmail.com> | 2021-09-10 17:16:18 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <cvicentiu@gmail.com> | 2021-09-10 17:16:18 +0300 |
| commit | 7c33ecb6651fb80f46bf9f3d8fee2e2f2b70995d (patch) | |
| tree | 7e44ff7393b97f739737c7d1427f042d72fdf46e /win | |
| parent | 6e3bd663d0fc669ffa6ab4c5f5aa57a1244ac555 (diff) | |
| parent | 4f85eadf71775979f97744abc536df6b67cf3e5d (diff) | |
| download | mariadb-git-7c33ecb6651fb80f46bf9f3d8fee2e2f2b70995d.tar.gz | |
Merge remote-tracking branch 'upstream/10.4' into 10.5
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | win/packaging/CPackZIPTestConfig.cmake | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/win/packaging/CMakeLists.txt b/win/packaging/CMakeLists.txt index d11053fa1dd..ba4a631f5fd 100644 --- a/win/packaging/CMakeLists.txt +++ b/win/packaging/CMakeLists.txt @@ -235,6 +235,12 @@ ADD_CUSTOM_TARGET( WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) +ADD_CUSTOM_TARGET( + win_package_test + COMMAND ${CMAKE_CPACK_COMMAND} ${CPACK_CONFIG_PARAM} --config ${CMAKE_CURRENT_SOURCE_DIR}/CPackZipTestConfig.cmake + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} +) + ADD_CUSTOM_TARGET(win_package DEPENDS win_package_zip win_package_debuginfo) SET_TARGET_PROPERTIES( win_package win_package_zip win_package_debuginfo diff --git a/win/packaging/CPackZIPTestConfig.cmake b/win/packaging/CPackZIPTestConfig.cmake new file mode 100644 index 00000000000..1dfba7ecabf --- /dev/null +++ b/win/packaging/CPackZIPTestConfig.cmake @@ -0,0 +1,6 @@ +INCLUDE(CPackConfig.cmake) +set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-test") +set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) +set(CPACK_COMPONENTS_GROUPING ALL_COMPONENTS_IN_ONE) +SET(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY ON) +SET(CPACK_COMPONENTS_ALL Test) |