summaryrefslogtreecommitdiff
path: root/win/packaging
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <cvicentiu@gmail.com>2021-09-09 09:18:12 +0300
committerVicențiu Ciorbaru <cvicentiu@gmail.com>2021-09-09 09:23:35 +0300
commitde7e027d5e5a67d207927c4643b744ec2da25aac (patch)
tree020cd80c7ce686593b73cef6912966ffc698e849 /win/packaging
parenta4b3970c6ec5cbdc03dd7301e5a6fdd1faa81932 (diff)
parenta6383a1954bb9deb61425fce9d71e02d2dea56bd (diff)
downloadmariadb-git-de7e027d5e5a67d207927c4643b744ec2da25aac.tar.gz
Merge remote-tracking branch 'upstream/10.3' into 10.4
Diffstat (limited to 'win/packaging')
-rw-r--r--win/packaging/CMakeLists.txt6
-rw-r--r--win/packaging/CPackZIPTestConfig.cmake6
2 files changed, 12 insertions, 0 deletions
diff --git a/win/packaging/CMakeLists.txt b/win/packaging/CMakeLists.txt
index af4283d9f07..66ac6300728 100644
--- a/win/packaging/CMakeLists.txt
+++ b/win/packaging/CMakeLists.txt
@@ -272,6 +272,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)