diff --git a/CMakeLists.txt b/CMakeLists.txt index 93c6f22d..16fa668b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,6 +44,9 @@ init_py_config("${CMAKE_CURRENT_SOURCE_DIR}/src/openalea/plantgl/config.py") if (MSVC) string(REGEX REPLACE "/W3" "/W0" ${CMAKE_CXX_FLAGS} "${${CMAKE_CXX_FLAGS}}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MD") + + # To fix compilation error with vc14 and boost + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DHAVE_SNPRINTF") endif() diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml index f6acbcaa..35754e76 100644 --- a/conda/conda_build_config.yaml +++ b/conda/conda_build_config.yaml @@ -1,5 +1,3 @@ -boost: - - 1.84 cxx_compiler: - gxx # [linux] - clangxx # [osx] diff --git a/conda/meta.yaml b/conda/meta.yaml index ebbcee43..32520c09 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -13,7 +13,7 @@ about: summary: An open-source graphic toolkit for the creation, simulation and analysis of 3D virtual plants. build: - number: 2 + number: 0 preserve_egg_dir: True requirements: @@ -30,7 +30,7 @@ requirements: - cgal-cpp>=5.4 - qhull - ann - - boost {{ boost }} + - boost - expat # [linux] - libxcb # [linux] - pthread-stubs # [linux] @@ -65,7 +65,7 @@ requirements: - numpy x.x - setuptools - ipython - - boost {{ boost }} + - boost - qhull - eigen - cgal-cpp diff --git a/src/cpp/plantgl/version.h b/src/cpp/plantgl/version.h index de443527..7d52dbe9 100644 --- a/src/cpp/plantgl/version.h +++ b/src/cpp/plantgl/version.h @@ -48,7 +48,7 @@ #define __plantgl_version_h__ /// PGL Version macro -#define PGL_VERSION 0x031500 +#define PGL_VERSION 0x031501 #endif