Merge pull request #22088 from mantidproject/msvc_2017_fixes (58fe287c) · Commits · mantidproject / mantid · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

mantid
- Activity
- Members
- Labels
- Wiki
- Releases
- Model registry

Snippets Groups Projects

58fe287c

Unverified Commit 58fe287c authored 6 years ago by Pete Peterson Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #22088 from mantidproject/msvc_2017_fixes

A few changes to support msvc 2017

parents bdadaa14 904e41e5

No related merge requests found

Changes 17

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Framework/Kernel/inc/MantidKernel/SingletonHolder.h 44 additions, 48 deletions

Framework/Kernel/inc/MantidKernel/SingletonHolder.h
Framework/Kernel/src/SingletonHolder.cpp 23 additions, 20 deletions

Framework/Kernel/src/SingletonHolder.cpp
Framework/Kernel/src/V3D.cpp 20 additions, 11 deletions

Framework/Kernel/src/V3D.cpp
Framework/Kernel/test/MultiFileNameParserTest.h 1 addition, 0 deletions

Framework/Kernel/test/MultiFileNameParserTest.h
Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp 3 additions, 1 deletion

Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp
Framework/MDAlgorithms/src/MDNormDirectSC.cpp 3 additions, 1 deletion

Framework/MDAlgorithms/src/MDNormDirectSC.cpp
Framework/MDAlgorithms/src/MDNormSCD.cpp 3 additions, 1 deletion

Framework/MDAlgorithms/src/MDNormSCD.cpp
Framework/Nexus/src/NexusClasses.cpp 2 additions, 2 deletions

Framework/Nexus/src/NexusClasses.cpp
Framework/PythonInterface/CMakeLists.txt 2 additions, 0 deletions

Framework/PythonInterface/CMakeLists.txt
buildconfig/CMake/BoostMPI.cmake 1 addition, 1 deletion

buildconfig/CMake/BoostMPI.cmake
buildconfig/CMake/FindBoost.cmake 0 additions, 1294 deletions

buildconfig/CMake/FindBoost.cmake
buildconfig/CMake/MSVCSetup.cmake 16 additions, 3 deletions

buildconfig/CMake/MSVCSetup.cmake
buildconfig/Jenkins/buildscript.bat 3 additions, 2 deletions

buildconfig/Jenkins/buildscript.bat
buildconfig/Jenkins/setupcompiler.bat 35 additions, 0 deletions

buildconfig/Jenkins/setupcompiler.bat
buildconfig/windows/command-prompt.bat.in 1 addition, 1 deletion

buildconfig/windows/command-prompt.bat.in
buildconfig/windows/pycharm.bat.in 0 additions, 0 deletions

buildconfig/windows/pycharm.bat.in
buildconfig/windows/visual-studio.bat.in 0 additions, 0 deletions

buildconfig/windows/visual-studio.bat.in

with 157 additions and 1385 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment