Merge 10.4 into 10.5

a793ae5b · Marko Mäkelä · 62516c53 · 9d479e25 · a793ae5b
Commit a793ae5b authored Jun 06, 2020 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

win/packaging/CMakeLists.txt win/packaging/CMakeLists.txt +6 -1

No files found.
--- a/win/packaging/CMakeLists.txt
+++ b/win/packaging/CMakeLists.txt
@@ -236,4 +236,9 @@ ADD_CUSTOM_TARGET(
 )

 ADD_CUSTOM_TARGET(win_package DEPENDS win_package_zip win_package_debuginfo)
-
+SET_TARGET_PROPERTIES(
+  win_package win_package_zip win_package_debuginfo
+  PROPERTIES
+  EXCLUDE_FROM_ALL TRUE
+  EXCLUDE_FROM_DEFAULT_BUILD TRUE
+)