no boost pls

schrodinger · May 12, 2024 · 7feb08b · 7feb08b
1 parent 861643c
commit 7feb08b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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']