mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-25 06:47:55 +08:00
bcf3d00d21
~~arm64-windows: boost-context builds are blocked by a cmake bug (see https://gitlab.kitware.com/cmake/cmake/-/issues/24317)~~ closes #32274 closes https://github.com/Neumann-A/my-vcpkg-triplets/issues/5 Questions: - [x] ~~Move cmake files to `share/cmake/<name>` ?~~ Not doing it because it is just using `vcpkg_cmake_config_fixup()` - [x] Fix weak dependencies (uwp|emscripten|android|arm)? - [x] Fix library names on !x64 (currently hardcoded to x64 or x86; failure in aricpp since it forces FindBoost module mode.) - [x] ~~Fix arm64-windows boost-context builds -> requires CMake (3.19.2?) update due to bug how the assembler is invoked.~~ (-> CI baseline for now) TODO: - [x] adjust generate ports script - [x] #37457 --------- Co-authored-by: Cheney-Wang <850426846@qq.com>
29 lines
990 B
Diff
29 lines
990 B
Diff
diff --git a/fabscript b/fabscript
|
|
index 8188779fd..6a136d82a 100644
|
|
--- a/fabscript
|
|
+++ b/fabscript
|
|
@@ -28,7 +28,7 @@ class has_numpy(try_run):
|
|
src = r"""
|
|
// If defined, enforces linking against PythonXXd.lib, which
|
|
// is usually not included in Python environments.
|
|
-#undef _DEBUG
|
|
+
|
|
#include "Python.h"
|
|
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
|
|
#include "numpy/arrayobject.h"
|
|
diff --git a/include/boost/detail/wrap_python.hpp b/include/boost/detail/wrap_python.hpp
|
|
index 037e4bf2e..a690913f2 100644
|
|
--- a/include/boost/python/detail/wrap_python.hpp
|
|
+++ b/include/boost/python/detail/wrap_python.hpp
|
|
@@ -42,8 +42,8 @@
|
|
# include <math.h>
|
|
# include <time.h>
|
|
# endif
|
|
-# undef _DEBUG // Don't let Python force the debug library just because we're debugging.
|
|
-# define DEBUG_UNDEFINED_FROM_WRAP_PYTHON_H
|
|
+//# undef _DEBUG // Don't let Python force the debug library just because we're debugging.
|
|
+//# define DEBUG_UNDEFINED_FROM_WRAP_PYTHON_H
|
|
# endif
|
|
#endif
|
|
|