From eb59376472d55a4006a98635a2f98990e4fb4cb1 Mon Sep 17 00:00:00 2001
From: Rechi <Rechi@users.noreply.github.com>
Date: Sun, 18 Mar 2018 20:05:00 +0100
Subject: [cmake][addons] make package-<ADDON-ID> multi config aware
---
cmake/scripts/common/AddonHelpers.cmake | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
(limited to 'cmake/scripts/common')
diff --git a/cmake/scripts/common/AddonHelpers.cmake b/cmake/scripts/common/AddonHelpers.cmake
index f6d79a40c0..5470940420 100644
--- a/cmake/scripts/common/AddonHelpers.cmake
+++ b/cmake/scripts/common/AddonHelpers.cmake
@@ -6,8 +6,13 @@
# Sadly we cannot extend the 'package' target, as it is a builtin target, see
# http://public.kitware.com/Bug/view.php?id=8438
# Thus, we have to add an 'addon-package' target.
-add_custom_target(addon-package
- COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target package)
+get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+if(_isMultiConfig)
+ add_custom_target(addon-package DEPENDS PACKAGE)
+else()
+ add_custom_target(addon-package
+ COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target package)
+endif()
macro(add_cpack_workaround target version ext)
if(NOT PACKAGE_DIR)
--
cgit v1.2.3