From d11944f5e473d71223756af87b155cf264fc0c85 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris+github@qwirx.com>
Date: Wed, 24 Oct 2018 21:18:03 +0100
Subject: [PATCH] Another attempt to fix running tests for NMake builds

---
 infrastructure/cmake/CMakeLists.txt | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt
index 1a1c000f4..14ff64442 100644
--- a/infrastructure/cmake/CMakeLists.txt
+++ b/infrastructure/cmake/CMakeLists.txt
@@ -194,9 +194,10 @@ endforeach()
 set(testmain_template_cpp
 	"${base_dir}/infrastructure/buildenv-testmain-template.cpp"
 )
-set(release_or_debug_dir
-	"${base_dir}/$<$<CONFIG:Debug>:debug>$<$<CONFIG:Release>:release>$<$<CONFIG:RelWithDebInfo>:release>"
+set(release_or_debug
+	"$<$<CONFIG:Debug>:debug>$<$<CONFIG:Release>:release>$<$<CONFIG:RelWithDebInfo>:release>"
 )
+set(release_or_debug_dir "${base_dir}/${release_or_debug}")
 
 if(WIN32)
 	set(time_test_command_prefix "")
@@ -288,12 +289,10 @@ foreach(module_dep ${module_deps})
 
 			if(generator_is_multi_config)
 				set(runtest_pl_test_mode_arg
-					$<$<CONFIG:Debug>:DEBUG>
-					$<$<CONFIG:Release>:RELEASE>
-					$<$<CONFIG:RelWithDebInfo>:RELEASE>
+					$<$<CONFIG:Debug>:DEBUG>$<$<CONFIG:Release>:RELEASE>$<$<CONFIG:RelWithDebInfo>:RELEASE>
 				)
 			else()
-				set(runtest_pl_test_mode_arg ${CMAKE_BUILD_TYPE})
+				set(runtest_pl_test_mode_arg ${release_or_debug})
 			endif()
 
 			if(WIN32)