AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-12-23 08:20:06 +00:00
Code Issues Releases Wiki Activity

Fixed examples link dependency on GLFW

Browse Source 
Split the examples/common objects into graphics API dependent object
libraries (following the pattern used for cemmon Ptex dependencies)
so that DX11 and Metal examples are no longer forced to link with GLFW.
This commit is contained in:
David G Yu 2020-02-12 11:23:13 -08:00
parent c3a34255cd
commit e0c14ddbef
14 changed files with 117 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
examples/common/CMakeLists.txt
View File

@ -44,56 +44,10 @@ set(EXAMPLES_COMMON_HEADER_FILES
viewerArgsUtils.h
)
if( OPENGL_FOUND AND (GLEW_FOUND AND GLFW_FOUND) OR (APPLE AND GLFW_FOUND))
list(APPEND EXAMPLES_COMMON_SOURCE_FILES
glControlMeshDisplay.cpp
glHud.cpp
glUtils.cpp
glShaderCache.cpp
)
list(APPEND EXAMPLES_COMMON_HEADER_FILES
glControlMeshDisplay.h
glHud.h
glUtils.h
glShaderCache.h
)
if (NOT "${OPENGL_INCLUDE_DIR}" STREQUAL "")
include_directories("${OPENGL_INCLUDE_DIR}")
endif()
if (GLEW_FOUND)
include_directories("${GLEW_INCLUDE_DIR}")
endif()
if (GLFW_FOUND)
include_directories("${GLFW_INCLUDE_DIR}")
endif()
endif()
if(DXSDK_FOUND)
list(APPEND EXAMPLES_COMMON_SOURCE_FILES
d3d11ControlMeshDisplay.cpp
d3d11Hud.cpp
d3d11Utils.cpp
d3d11ShaderCache.cpp
)
list(APPEND EXAMPLES_COMMON_HEADER_FILES
d3d11ControlMeshDisplay.h
d3d11Hud.h
d3d11Utils.h
d3d11ShaderCache.h
)
include_directories("${DXSDK_INCLUDE_DIR}")
endif()
include_directories(
"${OPENSUBDIV_INCLUDE_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}"
)
if(OPENCL_FOUND)
include_directories("${OPENCL_INCLUDE_DIRS}")
@ -117,19 +71,111 @@ if(CUDA_FOUND)
)
endif()
if( OPENGL_FOUND AND (GLEW_FOUND AND GLFW_FOUND) OR (APPLE AND GLFW_FOUND))
list(APPEND EXAMPLES_COMMON_GL_SOURCE_FILES
glControlMeshDisplay.cpp
glHud.cpp
glUtils.cpp
glShaderCache.cpp
)
list(APPEND EXAMPLES_COMMON_GL_HEADER_FILES
glControlMeshDisplay.h
glHud.h
glUtils.h
glShaderCache.h
)
if (NOT "${OPENGL_INCLUDE_DIR}" STREQUAL "")
include_directories("${OPENGL_INCLUDE_DIR}")
endif()
if (GLEW_FOUND)
include_directories("${GLEW_INCLUDE_DIR}")
endif()
if (GLFW_FOUND)
include_directories("${GLFW_INCLUDE_DIR}")
endif()
add_library(examples_common_gl_obj
OBJECT
${EXAMPLES_COMMON_SOURCE_FILES}
${EXAMPLES_COMMON_HEADER_FILES}
${EXAMPLES_COMMON_GL_SOURCE_FILES}
${EXAMPLES_COMMON_GL_HEADER_FILES}
)
set_target_properties(examples_common_gl_obj
PROPERTIES
FOLDER "examples"
)
endif()
if(DXSDK_FOUND)
list(APPEND EXAMPLES_COMMON_DX11_SOURCE_FILES
d3d11ControlMeshDisplay.cpp
d3d11Hud.cpp
d3d11Utils.cpp
d3d11ShaderCache.cpp
)
list(APPEND EXAMPLES_COMMON_DX11_HEADER_FILES
d3d11ControlMeshDisplay.h
d3d11Hud.h
d3d11Utils.h
d3d11ShaderCache.h
)
include_directories("${DXSDK_INCLUDE_DIR}")
add_library(examples_common_dx11_obj
OBJECT
${EXAMPLES_COMMON_SOURCE_FILES}
${EXAMPLES_COMMON_HEADER_FILES}
${EXAMPLES_COMMON_DX11_SOURCE_FILES}
${EXAMPLES_COMMON_DX11_HEADER_FILES}
)
set_target_properties(examples_common_dx11_obj
PROPERTIES
FOLDER "examples"
)
endif()
if(METAL_FOUND)
include_directories("${METAL_INCLUDE_DIR}")
list(APPEND EXAMPLES_COMMON_SOURCE_FILES
list(APPEND EXAMPLES_COMMON_MTL_SOURCE_FILES
mtlControlMeshDisplay.mm
mtlUtils.mm
mtlHud.mm
)
list(APPEND EXAMPLES_COMMON_HEADER_FILES
list(APPEND EXAMPLES_COMMON_MTL_HEADER_FILES
mtlControlMeshDisplay.h
mtlUtils.h
mtlHud.h
)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
add_library(examples_common_mtl_obj
OBJECT
${EXAMPLES_COMMON_SOURCE_FILES}
${EXAMPLES_COMMON_HEADER_FILES}
${EXAMPLES_COMMON_MTL_SOURCE_FILES}
${EXAMPLES_COMMON_MTL_HEADER_FILES}
)
set_target_properties(examples_common_mtl_obj
PROPERTIES
FOLDER "examples"
)
endif()
#-------------------------------------------------------------------------------
@ -195,21 +241,3 @@ set(EXAMPLES_COMMON_PTEX_INC_FILES )
)
endif()
#-------------------------------------------------------------------------------
include_directories(
"${OPENSUBDIV_INCLUDE_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}"
)
add_library(examples_common_obj
OBJECT
${EXAMPLES_COMMON_SOURCE_FILES}
${EXAMPLES_COMMON_HEADER_FILES}
)
set_target_properties(examples_common_obj
PROPERTIES
FOLDER "examples"
)

11
examples/dxPtexViewer/CMakeLists.txt
View File

@ -46,15 +46,6 @@ if (OPENCL_FOUND)
include_directories("${OPENCL_INCLUDE_DIRS}")
endif()
# XXX: This is unfortunate, we should probably refactor examples_common_obj
# to separate out the GL from the DX dependencies so that we don't end up
# in the situation where we have to link in GLFW for dxPtexViewer.
if (GLFW_FOUND)
list(APPEND PLATFORM_LIBRARIES
"${GLFW_LIBRARIES}"
)
endif()
set(SOURCE_FILES
dxPtexViewer.cpp
sky.cpp
@ -69,7 +60,7 @@ osd_add_possibly_cuda_executable(dxPtexViewer "examples" WIN32
"${INC_FILES}"
$<TARGET_OBJECTS:regression_common_obj>
$<TARGET_OBJECTS:regression_far_utils_obj>
$<TARGET_OBJECTS:examples_common_obj>
$<TARGET_OBJECTS:examples_common_dx11_obj>
$<TARGET_OBJECTS:examples_common_ptex_obj>
)

11
examples/dxViewer/CMakeLists.txt
View File

@ -42,15 +42,6 @@ if (OPENCL_FOUND)
include_directories("${OPENCL_INCLUDE_DIRS}")
endif()
# XXX: This is unfortunate, we should probably refactor examples_common_obj
# to separate out the GL from the DX dependencies so that we don't end up
# in the situation where we have to link in GLFW for dxViewer.
if (GLFW_FOUND)
list(APPEND PLATFORM_LIBRARIES
"${GLFW_LIBRARIES}"
)
endif()
set(SOURCE_FILES
dxViewer.cpp
)
@ -64,7 +55,7 @@ osd_add_possibly_cuda_executable(dxViewer "examples" WIN32
"${INC_FILES}"
$<TARGET_OBJECTS:regression_common_obj>
$<TARGET_OBJECTS:regression_far_utils_obj>
$<TARGET_OBJECTS:examples_common_obj>
$<TARGET_OBJECTS:examples_common_dx11_obj>
)
target_link_libraries(dxViewer

2
examples/farViewer/CMakeLists.txt
View File

@ -65,7 +65,7 @@ osd_add_glfw_executable(farViewer "examples"
$<TARGET_OBJECTS:vtr_obj>
$<TARGET_OBJECTS:far_obj>
$<TARGET_OBJECTS:regression_common_obj>
$<TARGET_OBJECTS:examples_common_obj>
$<TARGET_OBJECTS:examples_common_gl_obj>
)
target_link_libraries(farViewer
${PLATFORM_LIBRARIES}

2
examples/glEvalLimit/CMakeLists.txt
View File

@ -57,7 +57,7 @@ osd_add_glfw_executable(glEvalLimit "examples"
"${INC_FILES}"
$<TARGET_OBJECTS:regression_common_obj>
$<TARGET_OBJECTS:regression_far_utils_obj>
$<TARGET_OBJECTS:examples_common_obj>
$<TARGET_OBJECTS:examples_common_gl_obj>
)
target_link_libraries(glEvalLimit

4
examples/glFVarViewer/CMakeLists.txt
View File

@ -22,7 +22,7 @@
# language governing permissions and limitations under the Apache License.
#
# *** uvViewer ***
# *** glFVarViewer ***
set(SHADER_FILES
shader.glsl
@ -60,7 +60,7 @@ osd_add_glfw_executable(glFVarViewer "examples"
"${INC_FILES}"
$<TARGET_OBJECTS:regression_common_obj>
$<TARGET_OBJECTS:regression_far_utils_obj>
$<TARGET_OBJECTS:examples_common_obj>
$<TARGET_OBJECTS:examples_common_gl_obj>
)
target_link_libraries(glFVarViewer

4
examples/glImaging/CMakeLists.txt
View File

@ -22,6 +22,8 @@
# language governing permissions and limitations under the Apache License.
#
# *** glImaging ***
include_directories(
"${OPENSUBDIV_INCLUDE_DIR}"
"${GLFW_INCLUDE_DIR}"
@ -62,7 +64,7 @@ osd_add_glfw_executable(glImaging "examples"
"${SHADER_FILES}"
"${INC_FILES}"
$<TARGET_OBJECTS:regression_common_obj>
$<TARGET_OBJECTS:examples_common_obj>
$<TARGET_OBJECTS:examples_common_gl_obj>
)
target_link_libraries(glImaging

4
examples/glPaintTest/CMakeLists.txt
View File

@ -22,7 +22,7 @@
# language governing permissions and limitations under the Apache License.
#
# *** paintTest ***
# *** glPaintTest ***
set(SHADER_FILES
shader.glsl
@ -55,7 +55,7 @@ osd_add_glfw_executable(glPaintTest "examples"
"${SHADER_FILES}"
"${INC_FILES}"
$<TARGET_OBJECTS:regression_common_obj>
$<TARGET_OBJECTS:examples_common_obj>
$<TARGET_OBJECTS:examples_common_gl_obj>
)
target_link_libraries(glPaintTest

4
examples/glPtexViewer/CMakeLists.txt
View File

@ -22,7 +22,7 @@
# language governing permissions and limitations under the Apache License.
#
# *** ptexViewer ***
# *** glPtexViewer ***
set(SHADER_FILES
shader.glsl
@ -65,7 +65,7 @@ osd_add_glfw_executable(glPtexViewer "examples"
"${SHADER_FILES}"
"${INC_FILES}"
$<TARGET_OBJECTS:regression_common_obj>
$<TARGET_OBJECTS:examples_common_obj>
$<TARGET_OBJECTS:examples_common_gl_obj>
$<TARGET_OBJECTS:examples_common_ptex_obj>
)

4
examples/glShareTopology/CMakeLists.txt
View File

@ -22,7 +22,7 @@
# language governing permissions and limitations under the Apache License.
#
# *** topologySharing ***
# *** glShareTopology ***
set(SHADER_FILES
shader.glsl
@ -60,7 +60,7 @@ osd_add_glfw_executable(glShareTopology "examples"
"${SHADER_FILES}"
"${INC_FILES}"
$<TARGET_OBJECTS:regression_common_obj>
$<TARGET_OBJECTS:examples_common_obj>
$<TARGET_OBJECTS:examples_common_gl_obj>
)
target_link_libraries(glShareTopology

2
examples/glStencilViewer/CMakeLists.txt
View File

@ -48,7 +48,7 @@ osd_add_glfw_executable(glStencilViewer "examples"
"${INC_FILES}"
$<TARGET_OBJECTS:regression_common_obj>
$<TARGET_OBJECTS:regression_far_utils_obj>
$<TARGET_OBJECTS:examples_common_obj>
$<TARGET_OBJECTS:examples_common_gl_obj>
)
target_link_libraries(glStencilViewer

2
examples/glViewer/CMakeLists.txt
View File

@ -59,7 +59,7 @@ osd_add_glfw_executable(glViewer "examples"
"${INC_FILES}"
$<TARGET_OBJECTS:regression_common_obj>
$<TARGET_OBJECTS:regression_far_utils_obj>
$<TARGET_OBJECTS:examples_common_obj>
$<TARGET_OBJECTS:examples_common_gl_obj>
)
target_link_libraries(glViewer

9
examples/mtlPtexViewer/CMakeLists.txt
View File

@ -61,13 +61,6 @@ else()
set_source_files_properties("${BUNDLE_FILES}" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
endif()
# XXX: This is unfortunate, we should probably refactor examples_common_obj
# to separate out the GL from the Metal dependencies so that we don't end up
# in the situation where we have to link in GLFW for mtlViewer.
if (GLFW_FOUND)
list(APPEND PLATFORM_LIBRARIES "${GLFW_LIBRARIES}")
endif()
include_directories(
"${OPENSUBDIV_INCLUDE_DIR}"
"${METAL_INCLUDE_DIR}"
@ -98,7 +91,7 @@ osd_add_executable(mtlPtexViewer "examples/mtlPtexViewer"
"${BUNDLE_FILES}"
$<TARGET_OBJECTS:regression_common_obj>
$<TARGET_OBJECTS:regression_far_utils_obj>
$<TARGET_OBJECTS:examples_common_obj>
$<TARGET_OBJECTS:examples_common_mtl_obj>
$<TARGET_OBJECTS:examples_common_ptex_obj>
)

9
examples/mtlViewer/CMakeLists.txt
View File

@ -60,13 +60,6 @@ else()
set_source_files_properties("${BUNDLE_FILES}" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
endif()
# XXX: This is unfortunate, we should probably refactor examples_common_obj
# to separate out the GL from the Metal dependencies so that we don't end up
# in the situation where we have to link in GLFW for mtlViewer.
if (GLFW_FOUND)
list(APPEND PLATFORM_LIBRARIES "${GLFW_LIBRARIES}")
endif()
include_directories(
"${OPENSUBDIV_INCLUDE_DIR}"
"${METAL_INCLUDE_DIR}"
@ -95,7 +88,7 @@ osd_add_executable(mtlViewer "examples/mtlViewer"
"${BUNDLE_FILES}"
$<TARGET_OBJECTS:regression_common_obj>
$<TARGET_OBJECTS:regression_far_utils_obj>
$<TARGET_OBJECTS:examples_common_obj>
$<TARGET_OBJECTS:examples_common_mtl_obj>
)