From 7feb08b8729f34e88182a6d37c849aa9b427ed50 Mon Sep 17 00:00:00 2001 From: Jarrett Johnson Date: Sun, 12 May 2024 11:43:23 -0400 Subject: [PATCH] no boost pls --- .github/workflows/build.yml | 4 ++-- setup.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1f17c0c7..f9953c74f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,9 +84,9 @@ jobs: shell: cmd run: | git clone --depth 1 https://github.com/rcsb/mmtf-cpp.git - cp -R mmtf-cpp/include/mmtf* %CONDA_ROOT%/include/ + cp -R mmtf-cpp/include/mmtf* %CONDA_ROOT%/Library/include/ git clone --depth 1 --single-branch --branch cpp_master https://github.com/msgpack/msgpack-c.git - cp -R msgpack-c/include/msgpack* %CONDA_ROOT%/include/ + cp -R msgpack-c/include/msgpack* %CONDA_ROOT%/Library/include/ - name: Build PyMOL shell: cmd diff --git a/setup.py b/setup.py index cef07d5bc..eb18dd137 100644 --- a/setup.py +++ b/setup.py @@ -349,7 +349,10 @@ def make_launch_script(self): def_macros += [("_PYMOL_NO_MSGPACKC", None)] else: if options.use_msgpackc == 'c++11': - def_macros += [("MMTF_MSGPACK_USE_CPP11", None)] + def_macros += [ + ("MMTF_MSGPACK_USE_CPP11", None), + ("MSGPACK_NO_BOOST", None), + ] else: libs += ['msgpackc']