Merge pull request #105 from hsorby/develop

Fix problem when packaging with multiple configurations.
OpenCMISS · Mar 4, 2018 · f79af80 · f79af80
2 parents 7574efb + 375e16e
commit f79af80
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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})