Skip to content

Fix FindOpenGL.cmake when included more than once #24034

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

Merged
merged 1 commit into from
Apr 2, 2025
Merged

Fix FindOpenGL.cmake when included more than once #24034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 15 additions & 11 deletions cmake/Modules/FindOpenGL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,18 @@ mark_as_advanced(
OPENGL_gl_LIBRARY
)

add_library(OpenGL::GL INTERFACE IMPORTED)
set_target_properties(OpenGL::GL PROPERTIES
IMPORTED_LIBNAME "${OPENGL_gl_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${OPENGL_INCLUDE_DIR}"
)

add_library(OpenGL::GLU INTERFACE IMPORTED)
set_target_properties(OpenGL::GLU PROPERTIES
IMPORTED_LIBNAME "${OPENGL_glu_LIBRARY}"
INTERFACE_LINK_LIBRARIES OpenGL::GL
)
if (NOT TARGET OpenGL::GL)
add_library(OpenGL::GL INTERFACE IMPORTED)
set_target_properties(OpenGL::GL PROPERTIES
IMPORTED_LIBNAME "${OPENGL_gl_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${OPENGL_INCLUDE_DIR}"
)
endif()

if (NOT TARGET OpenGL::GLU)
add_library(OpenGL::GLU INTERFACE IMPORTED)
set_target_properties(OpenGL::GLU PROPERTIES
IMPORTED_LIBNAME "${OPENGL_glu_LIBRARY}"
INTERFACE_LINK_LIBRARIES OpenGL::GL
)
endif()
8 changes: 8 additions & 0 deletions test/cmake/find_modules/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,22 @@ project(find_modules)

add_executable(test_prog test.c)

find_package(OpenGL REQUIRED)
# Verify that find_package can be called twice without failing
find_package(OpenGL REQUIRED)
Copy link
Member

@kripken kripken Apr 2, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need these duplicate lines here and below?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to test that its safe to find the package more than once.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, maybe add a comment then. Otherwise the test code looks like it might be a copy-paste error I think.

target_include_directories(test_prog PRIVATE ${OPENGL_INCLUDE_DIR})
target_link_libraries(test_prog ${OPENGL_LIBRARIES})
message(STATUS " test: OPENGL_LIBRARIES: ${OPENGL_LIBRARIES}")

find_package(OpenAL REQUIRED)
# Verify that find_package can be called twice without failing
find_package(OpenAL REQUIRED)
target_include_directories(test_prog PRIVATE ${OPENAL_INCLUDE_DIR})
target_link_libraries(test_prog ${OPENAL_LIBRARY})
message(STATUS " test: OPENAL_LIBRARIES: ${OPENAL_LIBRARIES}")

find_package(SDL2 REQUIRED)
# Verify that find_package can be called twice without failing
find_package(SDL2 REQUIRED)
target_include_directories(test_prog PRIVATE ${SDL2_INCLUDE_DIRS})
target_link_libraries(test_prog SDL2::SDL2)
Expand All @@ -25,6 +31,8 @@ message(STATUS " test: OpenGL::GL IMPORTED_LIBNAME: ${TEST_OPENGL_GL_LIBNAME}")
get_target_property(TEST_OPENGL_GL_INCLUDES OpenGL::GL INTERFACE_INCLUDE_DIRECTORIES)
message(STATUS " test: OpenGL::GL INTERFACE_INCLUDE_DIRECTORIES: ${TEST_OPENGL_GL_INCLUDES}")

find_package(SDL3 REQUIRED)
# Verify that find_package can be called twice without failing
find_package(SDL3 REQUIRED)
add_executable(test_prog_sdl3 test_sdl3.c)
target_link_libraries(test_prog_sdl3 SDL3::SDL3)