Skip to content

Commit ad64219

Browse files
committed
Remove Python release type workaround
1 parent 3e0474f commit ad64219

File tree

7 files changed

+12
-63
lines changed

7 files changed

+12
-63
lines changed

CMakePresets.json

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,17 @@
9999
}
100100
},
101101
{
102-
"name": "clang",
102+
"name": "ninja-base",
103103
"hidden": true,
104104
"generator": "Ninja",
105+
"cacheVariables": {
106+
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
107+
}
108+
},
109+
{
110+
"name": "clang",
111+
"hidden": true,
112+
"inherits": [ "ninja-base" ],
105113
"cacheVariables": {
106114
"CMAKE_C_COMPILER": "/usr/bin/clang",
107115
"CMAKE_CXX_COMPILER": "/usr/bin/clang++"
@@ -110,7 +118,7 @@
110118
{
111119
"name": "msvc",
112120
"hidden": true,
113-
"generator": "Ninja",
121+
"inherits": [ "ninja-base" ],
114122
"cacheVariables": {
115123
"CMAKE_C_COMPILER": "cl.exe",
116124
"CMAKE_CXX_COMPILER": "cl.exe"
@@ -119,7 +127,7 @@
119127
{
120128
"name": "gcc",
121129
"hidden": true,
122-
"generator": "Ninja",
130+
"inherits": [ "ninja-base" ],
123131
"cacheVariables": {
124132
"CMAKE_C_COMPILER": "/usr/bin/gcc",
125133
"CMAKE_CXX_COMPILER": "/usr/bin/g++"

include/effectengine/EffectModule.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
#pragma once
22

33
#undef slots
4-
// Don't use debug Python APIs on Windows
5-
#if defined(_MSC_VER) && defined(_DEBUG)
6-
#if _MSC_VER >= 1930
7-
#include <corecrt.h>
8-
#endif
9-
#undef _DEBUG
104
#include <Python.h>
11-
#define _DEBUG
12-
#else
13-
#include <Python.h>
14-
#endif
155
#define slots Q_SLOTS
166

177
#include <QJsonValue>

include/python/PythonInit.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
#pragma once
22

33
#undef slots
4-
// Don't use debug Python APIs on Windows
5-
#if defined(_MSC_VER) && defined(_DEBUG)
6-
#if _MSC_VER >= 1930
7-
#include <corecrt.h>
8-
#endif
9-
#undef _DEBUG
10-
#include <Python.h>
11-
#define _DEBUG
12-
#else
134
#include <Python.h>
14-
#endif
155
#define slots Q_SLOTS
166

177
///

include/python/PythonProgram.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,7 @@
44
#include <QString>
55

66
#undef slots
7-
// Don't use debug Python APIs on Windows
8-
#if defined(_MSC_VER) && defined(_DEBUG)
9-
#if _MSC_VER >= 1930
10-
#include <corecrt.h>
11-
#endif
12-
#undef _DEBUG
137
#include <Python.h>
14-
#define _DEBUG
15-
#else
16-
#include <Python.h>
17-
#endif
188
#define slots Q_SLOTS
199

2010
#include <python/PythonUtils.h>

include/python/PythonUtils.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
#pragma once
22

33
#undef slots
4-
// Don't use debug Python APIs on Windows
5-
#if defined(_MSC_VER) && defined(_DEBUG)
6-
#if _MSC_VER >= 1930
7-
#include <corecrt.h>
8-
#endif
9-
#undef _DEBUG
10-
#include <Python.h>
11-
#define _DEBUG
12-
#else
134
#include <Python.h>
14-
#endif
155
#define slots Q_SLOTS
166

177
// decl

libsrc/effectengine/EffectEngine.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
1-
// Don't use debug Python APIs on Windows
2-
#if defined(_MSC_VER) && defined(_DEBUG)
3-
#if _MSC_VER >= 1930
4-
#include <corecrt.h>
5-
#endif
6-
#undef _DEBUG
71
#include <Python.h>
8-
#define _DEBUG
9-
#else
10-
#include <Python.h>
11-
#endif
122
#undef B0
133

144
// Qt includes

libsrc/utils/SysInfo.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
11
#include "HyperionConfig.h"
22

33
#if defined(ENABLE_EFFECTENGINE)
4-
// Don't use debug Python APIs on Windows
5-
#if defined(_MSC_VER) && defined(_DEBUG)
6-
#if _MSC_VER >= 1930
7-
#include <corecrt.h>
8-
#endif
9-
#undef _DEBUG
10-
#include <Python.h>
11-
#define _DEBUG
12-
#else
134
#include <Python.h>
145
#endif
15-
#endif
6+
167

178
#include "utils/SysInfo.h"
189
#include "utils/FileUtils.h"

0 commit comments

Comments
 (0)