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

Do not use find_package(glfw3) to detect if irrlicht+sdl is available #1599

Merged
merged 2 commits into from
Feb 14, 2024
Merged

Do not use find_package(glfw3) to detect if irrlicht+sdl is available #1599

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
627f1ad
Pass NO_MODULE to find_package(glfw3) call to avoid any interference …
traversaro Feb 13, 2024
5d614b3
Change IDYNTREE_USES_IRRLICHT heuristic
traversaro Feb 13, 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
11 changes: 8 additions & 3 deletions cmake/BuildiDynTree.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,13 @@ endif()
# Hack for disabling IDYNTREE_USES_IRRLICHT on vcpkg,
# remove once irrlicht+sdl is available on vcpkg,
# and https://github.com/robotology/robotology-superbuild-dependencies-vcpkg
# is modified to includ it
find_package(glfw3 QUIET)
# is modified to include it
if(WIN32 AND NOT ROBOTOLOGY_CONFIGURING_UNDER_CONDA)
# We assume that the case Win32 and not conda is vcpkg, where we do not have irrlicht+sdl
set(IDYNTREE_USES_IRRLICHT OFF)
else()
set(IDYNTREE_USES_IRRLICHT ON)
endif()

ycm_ep_helper(iDynTree TYPE GIT
STYLE GITHUB
Expand All @@ -34,7 +39,7 @@ ycm_ep_helper(iDynTree TYPE GIT
FOLDER src
CMAKE_ARGS -DIDYNTREE_USES_IPOPT:BOOL=ON
-DIDYNTREE_USES_OSQPEIGEN:BOOL=ON
-DIDYNTREE_USES_IRRLICHT:BOOL=${glfw3_FOUND}
-DIDYNTREE_USES_IRRLICHT:BOOL=${IDYNTREE_USES_IRRLICHT}
-DIDYNTREE_USES_ASSIMP:BOOL=ON
-DCMAKE_DISABLE_FIND_PACKAGE_YARP:BOOL=ON
-DIDYNTREE_USES_YARP:BOOL=OFF
Expand Down
Loading