@@ -226,20 +226,21 @@ if (MATPLOTPP_BUILD_EXPERIMENTAL_OPENGL_BACKEND)
226226 # find_package(GLAD REQUIRE) would suffice if it worked well
227227 FetchContent_Declare(glad GIT_REPOSITORY https://github.com/Dav1dde/glad.git GIT_TAG v0.1.36)
228228 FetchContent_MakeAvailable(glad)
229- else ()
230- if (TARGET glad)
231- add_library (glad::glad ALIAS glad)
232- endif ()
233- if (NOT TARGET glad::glad)
234- # FindGLAD does not usually create a target, so we create an interface target
235- add_library (glad::glad INTERFACE )
236- target_include_directories (glad::glad INTERFACE ${GLAD_INCLUDE_PATH} )
237- target_link_libraries (glad::glad INTERFACE ${GLAD_LIBRARIES} )
238- endif ()
229+ endif ()
230+ if (TARGET glad AND NOT TARGET glad::glad)
231+ # Alias glad to glad::glad
232+ add_library (glad::glad ALIAS glad)
233+ list (APPEND TARGETS glad)
234+ endif ()
235+ if (NOT TARGET glad::glad)
236+ # FindGLAD does not usually create a target, so we create an interface target
237+ add_library (glad::glad INTERFACE )
238+ target_include_directories (glad::glad INTERFACE ${GLAD_INCLUDE_PATH} )
239+ target_link_libraries (glad::glad INTERFACE ${GLAD_LIBRARIES} )
239240 endif ()
240241
241242 # https://github.com/glfw/glfw
242- find_package (glfw3)
243+ find_package (glfw3 QUIET )
243244 if ((NOT glfw3_FOUND AND NOT GLFW3_FOUND) OR NOT TARGET glfw)
244245 # Use CPM only if not found, to avoid ODR violations
245246 # find_package(glfw3 REQUIRE) would suffice if it worked well
0 commit comments