diff --git a/README.rst b/README.rst index 4e6fda3b..b96be660 100644 --- a/README.rst +++ b/README.rst @@ -137,7 +137,7 @@ Now, you can build, then install PlantGL : cmake .. -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} # Windows -> Visual Studio 2015 is required - cmake .. -G "Visual Studio 14 2015 Win64" -T host=x64 -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX% + cmake .. -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% .. cmake --build . --target install --config Release diff --git a/appveyor.yml b/appveyor.yml index a98e1c48..85eb9c3d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,18 +2,15 @@ platform: - x64 environment: + CONDA_RECIPE: conda + CONDA_VERSION: 3 + matrix: # Add here environement variables to control the Travis CI build - - CONDA_RECIPE: conda - CONDA_VERSION: 3 - CONDA_PY: 37 - - CONDA_RECIPE: conda - CONDA_VERSION: 3 - CONDA_PY: 38 + - CONDA_PY: 37 + - CONDA_PY: 38 CONDA_NPY: 116 - - CONDA_RECIPE: conda - CONDA_VERSION: 3 - CONDA_PY: 39 + - CONDA_PY: 39 CONDA_NPY: 119 install: 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-util/plantgl-devel-win.yaml b/build-util/plantgl-devel-win.yaml index bb314a82..0dc1300e 100644 --- a/build-util/plantgl-devel-win.yaml +++ b/build-util/plantgl-devel-win.yaml @@ -1,29 +1,30 @@ name: plantgl-devel channels: - - local - - defaults - conda-forge - - openalea + - fredboudon + - msys2 + - defaults dependencies: - python - - boost - - qt =5 + - setuptools + - cmake + - numpy + - boost <=1.72 + - qt - pyqt - - ipython - - qtconsole - - pyopengl - - pyqglviewer - - nose - - m2-bison [win] - - m2-flex [win] + - libpng + - zlib - qhull + - cgal-cpp + - gmp + - mpfr - eigen - ann - - menuinst - - patch - - setuptools - - openalea.deploy - - cmake >=3.12.0 - - menuinst [win] + - ipython + - pyopengl + - pyqglviewer + - pytest + - m2-bison + - m2-flex - scipy - - matplotlib + - matplotlib-base diff --git a/build-util/plantgl-devel.yaml b/build-util/plantgl-devel.yaml index 87813c9f..33623924 100644 --- a/build-util/plantgl-devel.yaml +++ b/build-util/plantgl-devel.yaml @@ -1,31 +1,29 @@ name: plantgl-devel channels: - - local + - conda-forge + - fredboudon - defaults - #- conda-forge - - openalea - - ethan13310 dependencies: - - python =3.7 + - python + - setuptools + - cmake + - numpy - boost - - qt =5 + - qt - pyqt - - ipython - - qtconsole - - pyopengl - #- pyqglviewer - - nose - - bison [unix] - - flex [unix] - - gmp [unix] - - mpfr [unix] - - cgal [unix] + - libpng + - zlib - qhull + - cgal-cpp + - gmp + - mpfr - eigen - ann - - patch - - setuptools - - openalea.deploy - - cmake >=3.12.0 + - ipython + - pyopengl + - pyqglviewer + - pytest + - bison + - flex - scipy - - matplotlib + - matplotlib-base 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 78670f5f..e56cbbc6 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -40,7 +40,7 @@ requirements: build: - python {{PY_VER}} - - binutils_impl_linux-64 # [linux] + - binutils_impl_linux-64 # [linux] - {{ compiler('cxx') }} - bison # [unix] - flex # [unix] @@ -50,15 +50,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}}