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

Link to the OpenGL::GL target instead of OPENGL_LIBRARIES #1603

Merged
merged 4 commits into from
Nov 28, 2023
Merged

Link to the OpenGL::GL target instead of OPENGL_LIBRARIES #1603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
005a253
cmake: factor out COMMON_LIBRARIES var from RenderMsl and RenderGlsl
pmolodo Nov 23, 2023
6d6a9cc
Link to the OpenGL::GL target, instead of ${OPENGL_LIBRARIES}
pmolodo Nov 22, 2023
be16436
Minor update for consistency
jstone-lucasfilm Nov 27, 2023
ed251ab
Merge branch 'main' into pr/cmake-GL-abs-path
jstone-lucasfilm Nov 28, 2023
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: 4 additions & 7 deletions source/MaterialXRenderGlsl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ if(MATERIALX_BUILD_SHARED_LIBS)
target_compile_definitions(${MATERIALX_MODULE_NAME} PUBLIC GLAD_GLAPI_EXPORT PRIVATE GLAD_GLAPI_EXPORT_BUILD)
endif()

set(COMMON_LIBRARIES
target_link_libraries(
${MATERIALX_MODULE_NAME}
MaterialXRenderHw
MaterialXGenGlsl
${CMAKE_DL_LIBS})
Expand All @@ -59,28 +60,24 @@ if(WIN32)
if(MSVC)
target_link_libraries(
${MATERIALX_MODULE_NAME}
${COMMON_LIBRARIES}
Opengl32)
elseif(MINGW)
target_link_libraries(
${MATERIALX_MODULE_NAME}
${COMMON_LIBRARIES}
Opengl32
gdi32)
endif()
elseif(APPLE)
target_link_libraries(
${MATERIALX_MODULE_NAME}
${COMMON_LIBRARIES}
${OPENGL_LIBRARIES}
OpenGL::GL
"-framework Foundation"
"-framework Cocoa"
"-framework Metal")
elseif(UNIX)
target_link_libraries(
${MATERIALX_MODULE_NAME}
${COMMON_LIBRARIES}
${OPENGL_LIBRARIES}
OpenGL::GL
${X11_LIBRARIES}
${X11_Xt_LIB})
endif()
Expand Down
21 changes: 9 additions & 12 deletions source/MaterialXRenderMsl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,34 +42,31 @@ add_library(${MATERIALX_MODULE_NAME} ${materialx_source} ${materialx_headers})

add_definitions(-DMATERIALX_RENDERMSL_EXPORTS)

set(COMMON_LIBRARIES
target_link_libraries(
${MATERIALX_MODULE_NAME}
MaterialXRenderHw
MaterialXGenMsl
${CMAKE_DL_LIBS})

if(APPLE AND NOT MATERIALX_BUILD_IOS)
set(COMMON_LIBRARIES
${COMMON_LIBRARIES}
"-framework Cocoa")
endif()

if(MSVC)
target_link_libraries(
${MATERIALX_MODULE_NAME}
${COMMON_LIBRARIES}
Opengl32)
elseif(APPLE)
if(NOT MATERIALX_BUILD_IOS)
target_link_libraries(
${MATERIALX_MODULE_NAME}
"-framework Cocoa"
OpenGL::GL)
endif()
target_link_libraries(
${MATERIALX_MODULE_NAME}
${COMMON_LIBRARIES}
${OPENGL_LIBRARIES}
"-framework Foundation"
"-framework Metal")
elseif(UNIX)
target_link_libraries(
${MATERIALX_MODULE_NAME}
${COMMON_LIBRARIES}
${OPENGL_LIBRARIES}
OpenGL::GL
${X11_LIBRARIES}
${X11_Xt_LIB})
endif()
Expand Down