Merge branch 'master' into jgrpp

# Conflicts:
#	cmake/CompileFlags.cmake
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/cargopacket.cpp
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/core/pool_func.hpp
#	src/date.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/ground_vehicle.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/mcf.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_station.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/station_kdtree.h
#	src/string_func.h
#	src/table/settings.ini
#	src/tgp.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/viewport_sprite_sorter_sse4.cpp
#	src/window.cpp

cmake/scripts/Regression.cmake

@@ -74,23 +74,30 @@ list(LENGTH REGRESSION_EXPECTED REGRESSION_EXPECTED_LENGTH)
 
 # Compare the output
 foreach(RESULT IN LISTS REGRESSION_RESULT)
-    list(GET REGRESSION_EXPECTED ${ARGC} EXPECTED)
+    unset(EXPECTED)
+    if(ARGC LESS REGRESSION_EXPECTED_LENGTH)
+        list(GET REGRESSION_EXPECTED ${ARGC} EXPECTED)
+    endif()
+
+    math(EXPR ARGC "${ARGC} + 1")
 
     if(NOT RESULT STREQUAL EXPECTED)
         message("${ARGC}: - ${EXPECTED}")
         message("${ARGC}: + ${RESULT}'")
         set(ERROR YES)
     endif()
-
-    math(EXPR ARGC "${ARGC} + 1")
 endforeach()
 
 if(NOT REGRESSION_EXPECTED_LENGTH EQUAL ARGC)
-    math(EXPR MISSING "${REGRESSION_EXPECTED_LENGTH} - ${ARGC}")
-    message("(${MISSING} more lines were expected than found)")
+    message("(${REGRESSION_EXPECTED_LENGTH} lines were expected but ${ARGC} were found)")
     set(ERROR YES)
 endif()
 
 if(ERROR)
-    message(FATAL_ERROR "Regression failed")
+    # Ouput the regression result to a file
+    set(REGRESSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/regression_${REGRESSION_TEST}_output.txt")
+    string(REPLACE ";" "\n" REGRESSION_RESULT "${REGRESSION_RESULT}")
+    file(WRITE ${REGRESSION_FILE} "${REGRESSION_RESULT}")
+
+    message(FATAL_ERROR "Regression failed - Output in ${REGRESSION_FILE}")
 endif()