Merge remote-tracking branch 'upstream/master' into 13.0

cmake/CompileFlags.cmake

@@ -56,6 +56,11 @@ macro(compile_flags)
 
     if(MSVC)
         add_compile_options(/W3)
+        if(MSVC_VERSION GREATER 1929)
+            # Starting with version 19.30, there is an optimisation bug, see #9966 for details
+            # This flag disables the broken optimisation to work around the bug
+            add_compile_options(/d2ssa-rse-)
+        endif()
     elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
         add_compile_options(
             -W

cmake/InstallAndPackage.cmake

@@ -123,6 +123,8 @@ set(CPACK_STRIP_FILES YES)
 set(CPACK_OUTPUT_FILE_PREFIX "bundles")
 
 if(APPLE)
+    # Stripping would produce unreadable stacktraces.
+    set(CPACK_STRIP_FILES NO)
     set(CPACK_GENERATOR "Bundle")
     include(PackageBundle)
 
@@ -130,7 +132,7 @@ if(APPLE)
         set(CPACK_PACKAGE_FILE_NAME "citymania-client-#CPACK_PACKAGE_VERSION#-macos-universal")
     else()
         set(CPACK_PACKAGE_FILE_NAME "citymania-client-#CPACK_PACKAGE_VERSION#-macos-${CPACK_SYSTEM_NAME}")
-	endif()
+    endif()
 elseif(WIN32)
     set(CPACK_GENERATOR "ZIP")
     if(OPTION_USE_NSIS)
@@ -182,6 +184,10 @@ elseif(UNIX)
             if(DISTRO_ID STREQUAL "arch")
                 set(PLATFORM "arch")
                 set(CPACK_GENERATOR "TXZ")
+            elseif(DISTRO_ID STREQUAL "fedora" OR DISTRO_ID STREQUAL "rhel")
+                set(PLATFORM "fedora")
+                set(CPACK_GENERATOR "RPM")
+                include(PackageRPM)
             else()
                 set(UNSUPPORTED_PLATFORM_NAME "Linux distribution '${DISTRO_ID}' from /etc/os-release")
             endif()

cmake/LinkPackage.cmake

@@ -18,6 +18,6 @@ function(link_package NAME)
             message(STATUS "${NAME} found -- -DWITH_${UCNAME} -- ${${NAME}_INCLUDE_DIRS} ${${NAME}_INCLUDE_DIR} -- ${${NAME}_LIBRARIES} ${${NAME}_LIBRARY}")
         endif()
     elseif(LP_ENCOURAGED)
-        message(WARNING "${NAME} not found; compiling OpenTTD without ${NAME} is strongly disencouraged")
+        message(WARNING "${NAME} not found; compiling OpenTTD without ${NAME} is strongly discouraged")
     endif()
 endfunction()

cmake/MSVCFilters.cmake

@@ -3,6 +3,7 @@
 source_group("AI Core" REGULAR_EXPRESSION "src/ai/")
 source_group("Blitters" REGULAR_EXPRESSION "src/blitter/")
 source_group("Core Source Code" REGULAR_EXPRESSION "src/core/")
+source_group("Font Cache" REGULAR_EXPRESSION "src/fontcache/")
 source_group("Game Core" REGULAR_EXPRESSION "src/game/")
 source_group("MD5" REGULAR_EXPRESSION "src/3rdparty/md5/")
 source_group("Misc" REGULAR_EXPRESSION "src/misc/")

cmake/Options.cmake

@@ -56,7 +56,7 @@ function(set_options)
 
     option(OPTION_DEDICATED "Build dedicated server only (no GUI)" OFF)
     option(OPTION_INSTALL_FHS "Install with Filesystem Hierarchy Standard folders" ${DEFAULT_OPTION_INSTALL_FHS})
-    option(OPTION_USE_ASSERTS "Use assertions; leave enabled for nightlies, betas, and RCs" OFF)
+    option(OPTION_USE_ASSERTS "Use assertions; leave enabled for nightlies, betas, and RCs" ON)
     if(EMSCRIPTEN)
         # Although pthreads is supported, it is not in a way yet that is
         # useful for us.

cmake/PackageRPM.cmake

@@ -0,0 +1 @@
+set(CPACK_RPM_PACKAGE_ARCHITECTURE "${ARCHITECTURE}")

cmake/scripts/GenerateWidget.cmake

@@ -13,6 +13,7 @@ cmake_minimum_required(VERSION 3.5)
 # The parameter "enumname" specifies the enumeration to extract. This can also be a regular expression.
 # The parameter "filename" specifies the relative path to the file, where the enumeration is extracted from. This can also be a glob expression.
 #
+# All files where enumerations are extracted from are automatically added via #include
 #
 
 if(NOT GENERATE_SOURCE_FILE)
@@ -41,6 +42,7 @@ foreach(ENUM IN LISTS ENUM_LINES)
 
         string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" FILE ${FILE})
         string(APPEND ${PLACE_HOLDER} "\n${ADD_INDENT}/* automatically generated from ${FILE} */")
+        list(APPEND INCLUDES "#include \"${FILE}\"")
 
         foreach(LINE IN LISTS SOURCE_LINES)
             string(REPLACE "${RM_INDENT}" "" LINE "${LINE}")
@@ -116,4 +118,7 @@ foreach(ENUM IN LISTS ENUM_LINES)
     endforeach()
  endforeach()
 
+ list(REMOVE_DUPLICATES INCLUDES)
+ string(REPLACE ";" "\n" INCLUDES "${INCLUDES}")
+
 configure_file(${GENERATE_SOURCE_FILE} ${GENERATE_BINARY_FILE})

cmake/scripts/Regression.cmake

@@ -35,6 +35,7 @@ execute_process(COMMAND ${OPENTTD_EXECUTABLE}
                         -vnull:ticks=30000
                         -d script=2
                         -d misc=9
+                        -Q
                 OUTPUT_VARIABLE REGRESSION_OUTPUT
                 ERROR_VARIABLE REGRESSION_RESULT
                 OUTPUT_STRIP_TRAILING_WHITESPACE

cmake/scripts/SquirrelIncludes.cmake

@@ -12,32 +12,11 @@ endif()
 if(NOT APIUC)
     message(FATAL_ERROR "Script needs APIUC defined")
 endif()
+if(NOT API_FILES)
+    message(FATAL_ERROR "Script needs API_FILES defined")
+endif()
 
-set(ARGC 1)
-set(ARG_READ NO)
-
-# For MSVC CMake runs this script from a batch file using || to detect errors,
-# depending on source path it may quote args, and cause cmd to not understand ||
-# and pass it as argument to ourself.
-# Read all the arguments given to CMake; we are looking for -- and everything
-# that follows, until ||. Those are our api files.
-while(ARGC LESS CMAKE_ARGC)
-    set(ARG ${CMAKE_ARGV${ARGC}})
-
-    if(ARG STREQUAL "||")
-        set(ARG_READ NO)
-    endif()
-
-    if(ARG_READ)
-        list(APPEND SCRIPT_API_BINARY_FILES "${ARG}")
-    endif()
-
-    if(ARG STREQUAL "--")
-        set(ARG_READ YES)
-    endif()
-
-    math(EXPR ARGC "${ARGC} + 1")
-endwhile()
+file(READ "${API_FILES}" SCRIPT_API_BINARY_FILES)
 
 foreach(FILE IN LISTS SCRIPT_API_BINARY_FILES)
     file(STRINGS "${FILE}" LINES REGEX "^void SQ${APIUC}.*_Register\\(Squirrel \\*engine\\)$")