Skip to content

Commit c6b5008

Browse files
authored
Specify MSVC version in relevant build scripts. (#39761)
### Description of work This PR specifies the MSVC version in order to avoid this compiler bug with the latest version: https://developercommunity.visualstudio.com/t/Code-optimization-causes-a-problem-with-/10908208 An issue will be raised to monitor this and address it going forwards. ### To test: Only effects package builds.
1 parent 2888cab commit c6b5008

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

CMakePresets.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"cacheVariables": {
2424
"CMAKE_BUILD_TYPE": "Release",
2525
"ENABLE_PRECOMMIT": "OFF",
26-
"COLORED_COMPILER_OUTPUT": "OFF"
26+
"COLORED_COMPILER_OUTPUT": "OFF",
27+
"CMAKE_CXX_SCAN_FOR_MODULES": "OFF"
2728
}
2829
},
2930
{
@@ -42,8 +43,7 @@
4243
"hidden": true,
4344
"cacheVariables": {
4445
"CMAKE_FIND_FRAMEWORK": "LAST",
45-
"USE_PYTHON_DYNAMIC_LIB": "OFF",
46-
"CMAKE_CXX_SCAN_FOR_MODULES": "OFF"
46+
"USE_PYTHON_DYNAMIC_LIB": "OFF"
4747
}
4848
},
4949
{

conda/recipes/mantid/bld.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
set "parent_dir=%RECIPE_DIR%\.."
44
CALL "%parent_dir%\archive_env_logs.bat" %BUILD_PREFIX% %PREFIX% mantid
55

6-
CALL "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" x64
6+
:: Specify MSVC version to avoid bug in 14.44
7+
CALL "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" x64 -vcvars_ver=14.38.17.8
78

89
mkdir build && cd build
910

conda/recipes/mantidqt/bld.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
set "parent_dir=%RECIPE_DIR%\.."
22
CALL "%parent_dir%\archive_env_logs.bat" %BUILD_PREFIX% %PREFIX% mantidqt
33

4-
CALL "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" x64
4+
:: Specify MSVC version to avoid bug in 14.44
5+
CALL "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" x64 -vcvars_ver=14.38.17.8
56

67
mkdir build && cd build
78

conda/recipes/mantidworkbench/bld.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
set "parent_dir=%RECIPE_DIR%\.."
22
CALL "%parent_dir%\archive_env_logs.bat" %BUILD_PREFIX% %PREFIX% mantidworkbench
33

4-
CALL "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" x64
4+
:: Specify MSVC version to avoid bug in 14.44
5+
CALL "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" x64 -vcvars_ver=14.38.17.8
56

67
mkdir build && cd build
78

0 commit comments

Comments
 (0)