From 375e16e926e18be170c089e2a60602ecbb13c274 Mon Sep 17 00:00:00 2001 From: Hugh Sorby Date: Mon, 26 Feb 2018 15:59:31 +1300 Subject: [PATCH] Fix problem when packaging with multiple configurations. --- Packaging/OCPackagingFunctions.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Packaging/OCPackagingFunctions.cmake b/Packaging/OCPackagingFunctions.cmake index d2711df..9d2e5bb 100644 --- a/Packaging/OCPackagingFunctions.cmake +++ b/Packaging/OCPackagingFunctions.cmake @@ -6,6 +6,10 @@ function(GET_INSTALL_QUADS PACKAGE_TYPE VAR_NAME) foreach(_build_config_stamps ${children}) file(TO_CMAKE_PATH "${_build_config_stamps}" _cmaked_build_config_stamps) get_filename_component(_build_config_dir ${_cmaked_build_config_stamps} DIRECTORY) + if (CMAKE_CONFIGURATION_TYPES) + # We have an extra configuration directory if this condition holds + get_filename_component(_build_config_dir ${_build_config_dir} DIRECTORY) + endif () get_filename_component(_config_dir ${_build_config_dir} DIRECTORY) include(${CONFIG_BASE_DIR}/${_cmaked_build_config_stamps})