From 6d38b1fe72186f25c06d2556c91f74f785c530a9 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 23 Mar 2017 17:11:30 -0700
Subject: [PATCH] handle MinSizeRel configuration in vhacd external

---
 cmake/externals/vhacd/CMakeLists.txt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cmake/externals/vhacd/CMakeLists.txt b/cmake/externals/vhacd/CMakeLists.txt
index befdce0b96..779451a304 100644
--- a/cmake/externals/vhacd/CMakeLists.txt
+++ b/cmake/externals/vhacd/CMakeLists.txt
@@ -26,8 +26,12 @@ string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
 if (WIN32)
   set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/lib/Debug/VHACD_LIB.lib CACHE FILEPATH "Path to V-HACD debug library")
 
-  # use generator expression to ensure the library is found when building RelWithDebInfo in VS
-  set(_LIB_FOLDER "$<$<CONFIG:RelWithDebInfo>:build/src/VHACD_Lib/RelWithDebInfo>$<$<NOT:$<CONFIG:RelWithDebInfo>>:lib/Release>")
+  # use generator expression to ensure the correct library is found when building different configurations in VS
+  set(_LIB_FOLDER """
+    $<$<CONFIG:RelWithDebInfo>:build/src/VHACD_Lib/RelWithDebInfo>
+    $<$<CONFIG:MinSizeRel>:build/src/VHACD_Lib/MinSizeRel>
+    $<$<OR:$<CONFIG:Release>,$<CONFIG:Debug>>:lib/Release>
+  """)
 
   set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/${_LIB_FOLDER}/VHACD_LIB.lib CACHE FILEPATH "Path to V-HACD release library")
 else ()