AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2025-01-18 04:00:06 +00:00
Code Issues Releases Wiki Activity

Additional fixes for dynamic and static linking

Browse Source 
Updated to link the GL loader objects directly
along with the osd GPU objects for both static
and dynamic libraries.
This commit is contained in:
David G Yu 2020-04-01 20:44:42 -07:00
parent 0ca74b2e8e
commit e7dfecc3bf
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -467,7 +467,6 @@ if(GLEW_FOUND AND GLEW_INCLUDE_DIR)
${GLEW_INCLUDE_DIR}
${PROJECT_SOURCE_DIR}/glLoader)
set(OPENGL_LOADER_LIBRARIES
$<TARGET_OBJECTS:glLoader_obj>
${GLEW_LIBRARY}
${OPENGL_gl_LIBRARY})
@ -478,7 +477,6 @@ elseif(OPENGL_FOUND)
${OPENGL_INCLUDE_DIR}
${PROJECT_SOURCE_DIR}/glLoader)
set(OPENGL_LOADER_LIBRARIES
$<TARGET_OBJECTS:glLoader_obj>
${OPENGL_gl_LIBRARY})
endif()

3
opensubdiv/CMakeLists.txt
View File

@ -209,6 +209,7 @@ if (NOT NO_LIB)
SHARED
version.cpp
$<TARGET_OBJECTS:osd_gpu_obj>
${OPENGL_LOADER_OBJS}
${CUDA_KERNEL_FILES}
)
@ -277,6 +278,7 @@ if (NOT NO_LIB)
$<TARGET_OBJECTS:far_obj>
$<TARGET_OBJECTS:osd_cpu_obj>
$<TARGET_OBJECTS:osd_gpu_obj>
${OPENGL_LOADER_OBJS}
)
set_target_properties(
@ -310,6 +312,7 @@ if (NOT NO_LIB)
$<TARGET_OBJECTS:far_obj>
$<TARGET_OBJECTS:osd_cpu_obj>
$<TARGET_OBJECTS:osd_gpu_obj>
${OPENGL_LOADER_OBJS}
)
set_target_properties(