From 758068da7eebf8ae826f98ab901029a86f9dcc85 Mon Sep 17 00:00:00 2001 From: Davis King Date: Tue, 30 Aug 2016 21:46:26 -0400 Subject: [PATCH] made the build script compile in newer versions of visual studio before older ones. --- .../WINDOWS_build_and_run_all_unit_tests.bat | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlib/test/WINDOWS_build_and_run_all_unit_tests.bat b/dlib/test/WINDOWS_build_and_run_all_unit_tests.bat index fdc7f85fa..a240298ae 100644 --- a/dlib/test/WINDOWS_build_and_run_all_unit_tests.bat +++ b/dlib/test/WINDOWS_build_and_run_all_unit_tests.bat @@ -16,6 +16,21 @@ cd .. +echo testing vc2015 >> test_log.txt +rm -rf build_vc2015_64 +mkdir build_vc2015_64 +cd build_vc2015_64 +cmake -G "Visual Studio 14 2015 Win64" .. +cmake --build . --config Release || exit /B +ping 127.0.0.1 -n 5 -w 1000 > null +cmake --build . --config Debug || exit /B +ping 127.0.0.1 -n 5 -w 1000 > null +cd Release +dtest --runall -d || exit /B +cd .. +cd .. + + @@ -50,21 +65,6 @@ cd .. cd .. -echo testing vc2015 >> test_log.txt -rm -rf build_vc2015_64 -mkdir build_vc2015_64 -cd build_vc2015_64 -cmake -G "Visual Studio 14 2015 Win64" .. -cmake --build . --config Release || exit /B -ping 127.0.0.1 -n 5 -w 1000 > null -cmake --build . --config Debug || exit /B -ping 127.0.0.1 -n 5 -w 1000 > null -cd Release -dtest --runall -d || exit /B -cd .. -cd .. - - del null type test_log.txt