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

Jump to bottom

[SofaFramework] Fix config files for Sofa.GL, for out-of-tree #1911

Merged
merged 2 commits into from
Mar 11, 2021
Merged

[SofaFramework] Fix config files for Sofa.GL, for out-of-tree #1911

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed3a58f
fix install config files for Sofa.GL
fredroy Mar 10, 2021
e5c89e8
Apply suggestions from code review
guparan Mar 11, 2021
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
4 changes: 4 additions & 0 deletions SofaKernel/SofaFramework/SofaFrameworkConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ set(SOFAHELPER_HAVE_BOOST "@SOFAHELPER_HAVE_BOOST@")
set(SOFAHELPER_HAVE_BOOST_FILESYSTEM "@SOFAHELPER_HAVE_BOOST_FILESYSTEM@")
set(SOFAHELPER_HAVE_BOOST_THREAD "@SOFAHELPER_HAVE_BOOST_THREAD@")
set(SOFAHELPER_HAVE_GTEST "@SOFAHELPER_HAVE_GTEST@")
set(SOFA_GL_HAVE_GLEW "@SOFA_GL_HAVE_GLEW@")
guparan marked this conversation as resolved.
Show resolved Hide resolved

# Find dependencies
find_package(Boost QUIET REQUIRED filesystem)
Expand All @@ -19,6 +20,9 @@ endif()
if(SOFAHELPER_HAVE_GTEST)
find_package(GTest CONFIG QUIET REQUIRED)
endif()
if(SOFA_GL_HAVE_GLEW)
find_package(GLEW QUIET REQUIRED)
endif()
guparan marked this conversation as resolved.
Show resolved Hide resolved

find_package(Sofa.Config QUIET REQUIRED)

Expand Down
4 changes: 2 additions & 2 deletions SofaKernel/modules/Sofa.GL/Sofa.GLConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
@PACKAGE_GUARD@
@PACKAGE_INIT@

set(SOFA.GL_HAVE_GLEW @SOFA.GL_HAVE_GLEW@)
set(SOFA_GL_HAVE_GLEW @SOFA_GL_HAVE_GLEW@)

find_package(SofaFramework QUIET REQUIRED) # SofaHelper SofaDefaulttype
find_package(OpenGL QUIET REQUIRED)

if(SOFA.GL_HAVE_GLEW)
if(SOFA_GL_HAVE_GLEW)
find_package(GLEW QUIET REQUIRED)
endif()

Expand Down