Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fredboudon modifications #63

Merged
merged 3 commits into from
Jan 24, 2024
Merged

fredboudon modifications #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5130788
Back to boost 1.82. Test with c++17
fredboudon Jan 24, 2024
0043d28
add macro to fix bug with boost
fredboudon Jan 24, 2024
17a64cd
v3.21.1
fredboudon Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()


Expand Down
2 changes: 0 additions & 2 deletions conda/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
boost:
- 1.84
cxx_compiler:
- gxx # [linux]
- clangxx # [osx]
Expand Down
6 changes: 3 additions & 3 deletions conda/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -30,7 +30,7 @@ requirements:
- cgal-cpp>=5.4
- qhull
- ann
- boost {{ boost }}
- boost
- expat # [linux]
- libxcb # [linux]
- pthread-stubs # [linux]
Expand Down Expand Up @@ -65,7 +65,7 @@ requirements:
- numpy x.x
- setuptools
- ipython
- boost {{ boost }}
- boost
- qhull
- eigen
- cgal-cpp
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/plantgl/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#define __plantgl_version_h__

/// PGL Version macro
#define PGL_VERSION 0x031500
#define PGL_VERSION 0x031501

#endif

Expand Down