From da02d47069a4c0492b45310e9236c41d7755b8bc Mon Sep 17 00:00:00 2001 From: Chris Burel Date: Fri, 16 Jul 2021 16:58:11 -0700 Subject: [PATCH 1/3] Re-enable using non-officially-supported generators when building with MSVC Signed-off-by: Chris Burel --- cmake/Platform/Common/MSVC/Configurations_msvc.cmake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake/Platform/Common/MSVC/Configurations_msvc.cmake b/cmake/Platform/Common/MSVC/Configurations_msvc.cmake index d61558bd49..156f6bbfd9 100644 --- a/cmake/Platform/Common/MSVC/Configurations_msvc.cmake +++ b/cmake/Platform/Common/MSVC/Configurations_msvc.cmake @@ -6,13 +6,15 @@ # # +set(minimum_supported_toolset 142) +if(MSVC_TOOLSET_VERSION VERSION_LESS ${minimum_supported_toolset}) + message(FATAL_ERROR "MSVC toolset ${MSVC_TOOLSET_VERSION} is too old, minimum supported toolset is ${minimum_supported_toolset}") +endif() +unset(minimum_supported_toolset) + include(cmake/Platform/Common/Configurations_common.cmake) include(cmake/Platform/Common/VisualStudio_common.cmake) -if(NOT CMAKE_GENERATOR MATCHES "Visual Studio 1[6-7]") - message(FATAL_ERROR "Generator ${CMAKE_GENERATOR} not supported") -endif() - # Verify that it wasn't invoked with an unsupported target/host architecture. Currently only supports x64/x64 if(CMAKE_VS_PLATFORM_NAME AND NOT CMAKE_VS_PLATFORM_NAME STREQUAL "x64") message(FATAL_ERROR "${CMAKE_VS_PLATFORM_NAME} target architecture is not supported, it must be 'x64'") From ebfaf269f65f3e54b6365ac936e7f21832f92e3b Mon Sep 17 00:00:00 2001 From: Chris Burel Date: Mon, 19 Jul 2021 11:43:44 -0700 Subject: [PATCH 2/3] Remove special compiler flags for unsupported VS2017 compiler Signed-off-by: Chris Burel --- cmake/Platform/Common/MSVC/Configurations_msvc.cmake | 8 -------- 1 file changed, 8 deletions(-) diff --git a/cmake/Platform/Common/MSVC/Configurations_msvc.cmake b/cmake/Platform/Common/MSVC/Configurations_msvc.cmake index 156f6bbfd9..41de1bd6a0 100644 --- a/cmake/Platform/Common/MSVC/Configurations_msvc.cmake +++ b/cmake/Platform/Common/MSVC/Configurations_msvc.cmake @@ -116,14 +116,6 @@ else() ) endif() -if(CMAKE_GENERATOR MATCHES "Visual Studio 15") - # Visual Studio 2017 has problems with [[maybe_unused]] on lambdas. Sadly, there is no different warning, so 4100 has to remain disabled on 2017 - ly_append_configurations_options( - COMPILATION - /wd4100 - ) -endif() - # Configure system includes ly_set(LY_CXX_SYSTEM_INCLUDE_CONFIGURATION_FLAG /experimental:external # Turns on "external" headers feature for MSVC compilers From f3cb0ee94df762e6d49e4f3a8096adfdf6baf382 Mon Sep 17 00:00:00 2001 From: Chris Burel Date: Mon, 19 Jul 2021 11:44:38 -0700 Subject: [PATCH 3/3] Remvoe Jenkins build configuration for unsupported VS2017 compiler Signed-off-by: Chris Burel --- .../build/Platform/Windows/package_build_config.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/scripts/build/Platform/Windows/package_build_config.json b/scripts/build/Platform/Windows/package_build_config.json index a5ca861377..89431ad96e 100644 --- a/scripts/build/Platform/Windows/package_build_config.json +++ b/scripts/build/Platform/Windows/package_build_config.json @@ -1,15 +1,4 @@ { - "profile_vs2017_atom": { - "COMMAND": "build_windows.cmd", - "PARAMETERS": { - "CONFIGURATION": "profile", - "OUTPUT_DIRECTORY": "windows_vs2017", - "CMAKE_OPTIONS": "-G \"Visual Studio 15 2017\" -A x64 -T host=x64 -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE", - "CMAKE_LY_PROJECTS": "AtomTest;AtomSampleViewer", - "CMAKE_TARGET": "ALL_BUILD", - "CMAKE_NATIVE_BUILD_ARGS": "/m:4 /p:CL_MPCount=!HALF_PROCESSORS! /nologo" - } - }, "profile_vs2019_atom": { "COMMAND":"build_windows.cmd", "PARAMETERS": {