Add cmake preset and make env file consistent with OSX and Linux

CMakePresets.json

@@ -20,6 +20,19 @@
                 "HDF5_ROOT": "$env{CONDA_PREFIX}",
                 "OpenSSL_ROOT": "$env{CONDA_PREFIX}"
             }
+        },
+        {
+            "name": "win",
+            "displayName": "win",
+            "description": "Default build options for a windows conda build",
+            "binaryDir": "${sourceDir}/build",
+            "generator": "Visual Studio 16 2019",
+            "cacheVariables": {
+                "CMAKE_PREFIX_PATH": "$env{CONDA_PREFIX}",
+                "CONDA_BUILD": true,
+                "HDF5_DIR": "$env{CONDA_PREFIX}/Library/cmake/hdf5"
+            }
         }
+
     ]
 }

mantid-developer-win.yml

@@ -2,53 +2,49 @@ name: mantid
 
 channels:
   - conda-forge
-  - DLR-SC
+  - DLR-SC # Required for OpenCascade
 
 dependencies:
-  - python=3.8
-  - cmake=3.19.7
-  - doxygen=1.9.1
-  - tbb=2020.2 # For release
-  - tbb-devel=2020.2 # Required for building
-  - boost-cpp=1.72.0
-  - boost=1.72.0 # Include only boost-python and boost-numpy
-  - poco=1.10.1
-  - nexus=4.4.3 # Not working on windows
-  - hdf5=1.10.6 
-  - gsl=2.6
-  - jsoncpp=1.9.4
-  - ninja=1.10.2
-  - graphviz=2.47.0
-  - librdkafka=1.6.0 
-  - eigen=3.3.9
-  - opencascade=7.4.0
-  - zlib=1.2.11
-  - muparser=2.3.2
-  - qt=5.12.9
-  # Python Packages: 
-  - setuptools=48.0.0
-  - qtwebkit=5.212
-  - qscintilla2=2.11.2 # Needs to be in conda, not pip due to C++ packages
-  - pyqt=5.12.3 # Has to be conda, not pip, installed to ensure that the sip packages are availiable in the share/sip/PyQt5 directory
-  - qtpy=1.9.0
-  - qtconsole=5.0.3
-  - numpy=1.20.2
-  - scipy=1.6.2
-  - sphinx=3.5.4
-  - pycifrw=4.4.1
-  - python-dateutil=2.8.1
-  - h5py=3.1.0
-  - psutil=5.8.0
-  - requests=2.25.1
-  - toml=0.10.2
-  - pyyaml=5.4.1
+  - boost=1.75.* # Also pulls in boost-cpp
+  - cmake>=3.20.*
+  - doxygen>=1.9.*
+  - eigen=3.3.*
+  - graphviz>=2.47.0
+  - gsl=2.6 # Keep gsl a specific version to reduce changes in our fitting
+  - h5py>=2.10.0,<3 # Pinned back due to api differences
+  - hdf5=1.10.*
+  - jsoncpp>=1.9.4,<2
+  - librdkafka>=1.6.0
   - lib3mf # windows only
+  - muparser>=2.3.2
+  - nexus=4.4.*
+  - ninja>=1.10.2
+  - numpy>=1.20.2
+  - opencascade>=7.4.0
+  - conda-wrappers
+  - pip>=21.0.1
+  - poco=1.10.*
+  - psutil>=5.8.0
+  - pycifrw>=4.4.1
+  - pyqt>=5.12.3,<6
+  - python-dateutil>=2.8.1
+  - python=3.8.*
+  - pyyaml>=5.4.1
+  - qscintilla2>=2.11.2
+  - qt>=5.12.9,<6
+  - qtconsole>=5.0.3,<6
+  - qtpy>=1.9.0
+  - requests>=2.25.1
+  - scipy>=1.6.2
+  - setuptools=48.0.0 # Pinned purposefully due to incompatibility with later versions
+  - sphinx>=3.5.4
+  - tbb-devel=2020.2.*
+  - tbb=2020.2.*
+  - toml>=0.10.2
+  - zlib>=1.2.11
   # Needed only for development
-  - pip=21.0.1
-  - pre-commit=2.12.0
-  - cppcheck=2.4.1
-  - cxxtest=4.4
-  # Using pip for python packages that aren't present in conda-forge or mantid packages for python 3.8
+  - cppcheck>=2.4.1
+  - pre-commit>=2.12.0
   - pip:
-    - sphinx-bootstrap-theme==0.7.1
-    - matplotlib==3.1.3 # PFip used for package compatibility (Conda seems to have a broken dependancy list), otherwise a high version number is needed which doesn't work right now for workbench.
\ No newline at end of file
+      - matplotlib==3.1.3 # Pip used for package compatibility (Conda seems to have a broken dependancy list), otherwise a high version number is needed (for use on conda) which doesn't work right now for workbench. Pinned at 3.1.3 as is highest/currently used and compatible with Workbench.
+      - sphinx-bootstrap-theme>=0.7.1