From 0f98465f0aa1a9a2af5b16c7de529dca02c6eafd Mon Sep 17 00:00:00 2001
From: dan sinclair <dsinclair@google.com>
Date: Tue, 15 Oct 2019 19:11:39 -0400
Subject: [PATCH] Update CMakeLists.txt

---
 CMakeLists.txt | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5a4f67..62ee66a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -193,16 +193,20 @@ if(BUILD_TESTING)
     COMMAND bash ${IGNORE_CR_FLAG} runtests
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Test/)
 
-  set_property(TEST glslang-testsuite APPEND PROPERTY
-    ENVIRONMENT GLSLANG_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/glslangValidator)
-  set_property(TEST glslang-testsuite APPEND PROPERTY
-    ENVIRONMENT SPIRV_REMAP_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/spirv-remap)
-
+  
   if (CMAKE_CONFIGURATION_TYPES)
     set_property(TEST glslang-testsuite APPEND PROPERTY
+      ENVIRONMENT GLSLANG_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/$<CONFIGURATION>/glslangValidator)
+    set_property(TEST glslang-testsuite APPEND PROPERTY
+      ENVIRONMENT SPIRV_REMAP_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/$<CONFIGURATION>/spirv-remap)
+    set_property(TEST glslang-testsuite APPEND PROPERTY
       ENVIRONMENT GLSLANG_TEST_RESULTS=${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>/localResults)
   else(CMAKE_CONFIGURATION_TYPES)
     set_property(TEST glslang-testsuite APPEND PROPERTY
+      ENVIRONMENT GLSLANG_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/glslangValidator)
+    set_property(TEST glslang-testsuite APPEND PROPERTY
+      ENVIRONMENT SPIRV_REMAP_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/spirv-remap)
+    set_property(TEST glslang-testsuite APPEND PROPERTY
       ENVIRONMENT GLSLANG_TEST_RESULTS=${CMAKE_CURRENT_BINARY_DIR}/localResults)
   endif(CMAKE_CONFIGURATION_TYPES)
 endif(BUILD_TESTING)
-- 
2.7.4