diff --git a/build-util/compile-osx.sh b/build-util/compile-osx.sh index 2bf8875a..12a397ac 100755 --- a/build-util/compile-osx.sh +++ b/build-util/compile-osx.sh @@ -7,6 +7,7 @@ cmake -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} \ -DOPENGL_gl_LIBRARY=/Users/fboudon/Develop/SDK/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework \ -DOPENGL_glu_LIBRARY=/Users/fboudon/Develop/SDK/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework \ -DBoost_DEBUG=ON \ + -DCMAKE_IGNORE_PATH=/opt/local/lib \ -LAH .. #cmake -DCMAKE_BUILD_TYPE=Release -DBoost_INCLUDE_DIR=/opt/local/include .. @@ -15,3 +16,7 @@ make make install cd .. python setup.py install + +{ + +} \ No newline at end of file diff --git a/build.sh b/build.sh index 5c72b163..7213ebbf 100755 --- a/build.sh +++ b/build.sh @@ -1 +1 @@ -conda build . -c conda-forge -c fredboudon --python=3.8 --numpy=1.16 | tee build.log +conda build . -c conda-forge -c fredboudon --python=3.7 --numpy=1.11 | tee build.log diff --git a/conda/meta.yaml b/conda/meta.yaml index 78f4a3ce..5874d232 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -16,8 +16,6 @@ build: number: 1 preserve_egg_dir: True -# boost heap 1.74 do not work with visual. see https://github.com/boostorg/heap/commit/ed015c3b21c10166321f7565e038b690ad8e04df - requirements: host: - python {{PY_VER}} @@ -31,18 +29,17 @@ requirements: - cgal-cpp - qhull - ann - - boost <=1.73 # [win] - - boost # [linux] - - expat # [linux] - - libxcb # [linux] - - pthread-stubs # [linux] - - {{ cdt('mesa-libgl-devel') }} # [linux] + - boost <=1.73 + - expat # [linux] + - libxcb # [linux] + - pthread-stubs # [linux] + - {{ cdt('mesa-libgl-devel') }} # [linux] - libglu # [linux] - xorg-libxfixes # [linux] build: - python {{PY_VER}} - - binutils_impl_linux-64 # [linux] + - binutils_impl_linux-64 # [linux] - {{ compiler('cxx') }} - bison # [unix] - flex # [unix] @@ -52,15 +49,15 @@ requirements: - cmake - pkg-config # [linux] - make # [unix] - - {{ cdt('mesa-libgl-devel') }} # [linux] - - {{ cdt('mesa-dri-drivers') }} # [linux] - - {{ cdt('libxext') }} # [linux] - - {{ cdt('libselinux') }} # [linux] - - {{ cdt('libxdamage') }} # [linux] - - {{ cdt('libxfixes') }} # [linux] - - {{ cdt('libxxf86vm') }} # [linux] - - {{ cdt('libxcb') }} # [linux] - - {{ cdt('expat-devel') }} # [linux] + - {{ cdt('mesa-libgl-devel') }} # [linux] + - {{ cdt('mesa-dri-drivers') }} # [linux] + - {{ cdt('libxext') }} # [linux] + - {{ cdt('libselinux') }} # [linux] + - {{ cdt('libxdamage') }} # [linux] + - {{ cdt('libxfixes') }} # [linux] + - {{ cdt('libxxf86vm') }} # [linux] + - {{ cdt('libxcb') }} # [linux] + - {{ cdt('expat-devel') }} # [linux] run: - python {{PY_VER}}