Update paths to match new cmake-generated project files location.

boxbackup · Feb 14, 2016 · e691016 · e691016
1 parent 95a0779
commit e691016
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt
@@ -200,7 +200,7 @@ foreach(module_dep
 				"${module_path}/_main.cpp")
 			add_test(NAME ${test_name}
 				COMMAND ${PERL_EXECUTABLE} ${base_dir}/runtest.pl.in ${test_name}
-				$<CONFIG>)
+				$<CONFIG> WORKING_DIRECTORY ${base_dir})
 		elseif(module_name MATCHES "^(lib_.*|qdbm)$")
 			if(DEBUG)
 				message(STATUS "add library '${module_name}': '${module_files}'")

diff --git a/runtest.pl.in b/runtest.pl.in
@@ -126,9 +126,9 @@ sub runtest
 
 		my @commands = (
 			"msbuild /nologo $quiet ".
-			"infrastructure\\cmake\\INSTALL.vcxproj",
+			"infrastructure\\cmake\\build\\INSTALL.vcxproj",
 			"xcopy /s /i /y /q $test_src_dir $test_dst_dir",
-			"copy infrastructure\\cmake\\$test_mode\\$test_project_exe.exe $test_dst_dir"
+			"copy infrastructure\\cmake\\build\\$test_mode\\$test_project_exe.exe $test_dst_dir"
 		);
 
 		if(-d $test_dst_dir)