Merge pull request #63 from fredboudon/master

fredboudon modifications
openalea · Jan 24, 2024 · d940c17 · d940c17
2 parents 4c8614e + 17a64cd
commit d940c17
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -1,5 +1,3 @@
-boost:
-  - 1.84
 cxx_compiler:
   - gxx                        # [linux]
   - clangxx                    # [osx]

diff --git 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
@@ -48,7 +48,7 @@
 #define __plantgl_version_h__
 
 /// PGL Version macro
-#define PGL_VERSION 0x031500
+#define PGL_VERSION 0x031501
 
 #endif