Merge branch 'fredboudon-master'

.github/workflows/conda-package-build.yml

@@ -14,7 +14,5 @@ on:
 jobs:
   build:
     uses: openalea/github-action-conda-build/.github/workflows/conda-package-build.yml@main
-    with:
-      conda-channels: openalea3, conda-forge
     secrets: 
       anaconda_token: ${{ secrets.ANACONDA_TOKEN }}

CMakeLists.txt

@@ -13,8 +13,6 @@ project(plantgl CXX)
 
 # --- Build setup
 
-set(CMAKE_INCLUDE_PATH "$ENV{CONDA_PREFIX}/include" ${CMAKE_INCLUDE_PATH})
-set(CMAKE_LIBRARY_PATH "$ENV{CONDA_PREFIX}/lib" ${CMAKE_LIBRARY_PATH})
 set(CMAKE_SKIP_BUILD_RPATH FALSE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")

cmake/Anaconda.cmake

@@ -3,7 +3,9 @@ if (DEFINED ENV{CONDA_PREFIX})
     # Anaconda Environment
     message(STATUS "Anaconda environment detected: " $ENV{CONDA_PREFIX})
 
-
+    set(CMAKE_INCLUDE_PATH "$ENV{CONDA_PREFIX}/include" ${CMAKE_INCLUDE_PATH})
+    set(CMAKE_LIBRARY_PATH "$ENV{CONDA_PREFIX}/lib" ${CMAKE_LIBRARY_PATH})
+
     if (DEFINED ENV{PREFIX})
         file(TO_CMAKE_PATH $ENV{PREFIX} TMP_CONDA_ENV)
     else()
@@ -55,6 +57,11 @@ if (DEFINED ENV{CONDA_BUILD})
     if (APPLE)
         list(APPEND CMAKE_FIND_ROOT_PATH $ENV{CONDA_BUILD_SYSROOT} )
     endif()
+    if (WIN32)
+        list(APPEND CMAKE_FIND_ROOT_PATH $ENV{BUILD_PREFIX}/Library/usr $ENV{PREFIX}/Library/usr)
+        set(CMAKE_INCLUDE_PATH "$ENV{BUILD_PREFIX}/Library/usr/include" ${CMAKE_INCLUDE_PATH})
+        set(CMAKE_LIBRARY_PATH "$ENV{BUILD_PREFIX}/Library/usr/lib" ${CMAKE_LIBRARY_PATH})
+    endif()
     if (UNIX)
         # I add both old stype and new style cdts : https://github.com/conda-forge/cdt-builds#old-stylelegacy-vs-new-style-cdts
         list(APPEND CMAKE_FIND_ROOT_PATH $ENV{BUILD_PREFIX}/x86_64-conda-linux-gnu/sysroot $ENV{BUILD_PREFIX}/$ENV{HOST}/sysroot )

conda/conda_build_config.yaml

@@ -1,11 +1,5 @@
-numpy:
-  - 1.22                  # [win]
-  - 1.22                  # [osx]
-  - 1.22                  # [linux]
 boost:
-  - 1.74                   # [win]
-  - 1.78                   # [osx]
-  - 1.78                   # [linux]
+  - 1.84
 cxx_compiler:
   - gxx                        # [linux]
   - clangxx                    # [osx]

conda/meta.yaml

@@ -30,7 +30,7 @@ requirements:
       - cgal-cpp>=5.4
       - qhull
       - ann
-      - boost {{ boost }}                    
+      - boost  {{ boost }}                   
       - expat                              # [linux]
       - libxcb                             # [linux]
       - pthread-stubs                      # [linux]