Skip to content
This repository was archived by the owner on Jan 21, 2025. It is now read-only.

Fix problem compiling Mantid in Debug on VS2022 #70

Merged
martyngigg merged 2 commits into from
Mar 24, 2022
Merged

Fix problem compiling Mantid in Debug on VS2022 #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d35cde3
Import crtdefs.h before undefining _DEBUG
DannyHindson Mar 17, 2022
5fae898
Update second instance of header file with same fix
DannyHindson Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions build-scripts/extras/python/wrappython.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@

#ifdef _DEBUG
# ifndef MANTID_DEBUG_PYTHON
// Workaround for VS 2022 which doesn't like _DEBUG being messed with. Based on PyBind solution
// https://github.com/pybind/pybind11/pull/3497
# include<yvals.h>
# if _MSVC_STL_VERSION >= 143
# include <crtdefs.h>
# endif
# undef _DEBUG // Don't let Python force the debug library just because we're debugging.
# define DEBUG_UNDEFINED_FROM_WRAP_PYTHON_H
# endif
Expand Down
6 changes: 6 additions & 0 deletions lib/python3.8/include/wrappython.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@

#ifdef _DEBUG
# ifndef MANTID_DEBUG_PYTHON
// Workaround for VS 2022 which doesn't like _DEBUG being messed with. Based on PyBind solution
// https://github.com/pybind/pybind11/pull/3497
# include<yvals.h>
# if _MSVC_STL_VERSION >= 143
# include <crtdefs.h>
# endif
# undef _DEBUG // Don't let Python force the debug library just because we're debugging.
# define DEBUG_UNDEFINED_FROM_WRAP_PYTHON_H
# endif
Expand Down