diff --git a/SofaKernel/modules/Sofa.GL/CMakeLists.txt b/SofaKernel/modules/Sofa.GL/CMakeLists.txt index f4c588f7ec9..eb698685cca 100644 --- a/SofaKernel/modules/Sofa.GL/CMakeLists.txt +++ b/SofaKernel/modules/Sofa.GL/CMakeLists.txt @@ -4,7 +4,7 @@ project(Sofa.GL LANGUAGES CXX) set(SOFAGLSRC_ROOT "src/sofa/gl") sofa_find_package(OpenGL REQUIRED BOTH_SCOPES) -sofa_find_package(GLEW BOTH_SCOPES) +sofa_find_package(GLEW BOTH_SCOPES REQUIRED) set(HEADER_FILES ${SOFAGLSRC_ROOT}/config.h.in @@ -71,13 +71,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux AND SOFA_BUILD_RELEASE_PACKAGE AND OPENGL_GL sofa_install_libraries(PATHS ${OPENGL_glu_LIBRARY}) endif() -if(GLEW_FOUND) - target_link_libraries(${PROJECT_NAME} PUBLIC GLEW::GLEW) - if (SOFA_BUILD_RELEASE_PACKAGE OR CMAKE_SYSTEM_NAME STREQUAL Windows) - sofa_install_libraries(TARGETS GLEW::GLEW) - endif() -else() - message("OpenGL advanced functions (e.g shaders, FBO) are disabled.") +target_link_libraries(${PROJECT_NAME} PUBLIC GLEW::GLEW) +if (SOFA_BUILD_RELEASE_PACKAGE OR CMAKE_SYSTEM_NAME STREQUAL Windows) + sofa_install_libraries(TARGETS GLEW::GLEW) endif() sofa_create_package_with_targets( diff --git a/SofaKernel/modules/Sofa.GL/Sofa.GLConfig.cmake.in b/SofaKernel/modules/Sofa.GL/Sofa.GLConfig.cmake.in index 4f2d8b1fba3..0540f73703e 100644 --- a/SofaKernel/modules/Sofa.GL/Sofa.GLConfig.cmake.in +++ b/SofaKernel/modules/Sofa.GL/Sofa.GLConfig.cmake.in @@ -7,10 +7,7 @@ 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) - find_package(GLEW QUIET REQUIRED) -endif() +find_package(GLEW QUIET REQUIRED) if(NOT TARGET @PROJECT_NAME@) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")