AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-11-09 13:50:05 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1174 from davidgyu/dev_ptex_dependency_fix

Browse Source 
Fixed Ptex link dependencies
This commit is contained in:
George ElKoura 2020-01-15 18:10:12 -08:00 committed by GitHub
commit 69af58f7aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
examples/common/CMakeLists.txt
View File

@ -22,12 +22,6 @@
# language governing permissions and limitations under the Apache License.
#
set(EXAMPLES_COMMON_SHADER_FILES
glslPtexCommon.glsl
hlslPtexCommon.hlsl
mtlPtexCommon.metal
)
set(EXAMPLES_COMMON_SOURCE_FILES
font_image.cpp
hdr_reader.cpp
@ -140,40 +134,66 @@ endif()
#-------------------------------------------------------------------------------
if( PTEX_FOUND )
list(APPEND EXAMPLES_COMMON_HEADER_FILES
list(APPEND EXAMPLES_COMMON_PTEX_HEADER_FILES
ptexMipmapTextureLoader.h
)
list(APPEND EXAMPLES_COMMON_SOURCE_FILES
list(APPEND EXAMPLES_COMMON_PTEX_SOURCE_FILES
ptexMipmapTextureLoader.cpp
)
if( OPENGL_FOUND )
list(APPEND EXAMPLES_COMMON_SOURCE_FILES
list(APPEND EXAMPLES_COMMON_PTEX_SOURCE_FILES
glPtexMipmapTexture.cpp
)
list(APPEND EXAMPLES_COMMON_HEADER_FILES
list(APPEND EXAMPLES_COMMON_PTEX_HEADER_FILES
glPtexMipmapTexture.h
)
endif()
if( DXSDK_FOUND )
list(APPEND EXAMPLES_COMMON_SOURCE_FILES
list(APPEND EXAMPLES_COMMON_PTEX_SOURCE_FILES
d3d11PtexMipmapTexture.cpp
)
list(APPEND EXAMPLES_COMMON_HEADER_FILES
list(APPEND EXAMPLES_COMMON_PTEX_HEADER_FILES
d3d11PtexMipmapTexture.h
)
endif()
if( METAL_FOUND )
list(APPEND EXAMPLES_COMMON_SOURCE_FILES
list(APPEND EXAMPLES_COMMON_PTEX_SOURCE_FILES
mtlPtexMipmapTexture.mm
)
list(APPEND EXAMPLES_COMMON_HEADER_FILES
list(APPEND EXAMPLES_COMMON_PTEX_HEADER_FILES
mtlPtexMipmapTexture.h
)
endif()
include_directories( "${PTEX_INCLUDE_DIR}" )
list(APPEND PLATFORM_CPU_LIBRARIES
${PTEX_LIBRARY}
set(EXAMPLES_COMMON_PTEX_SHADER_FILES
glslPtexCommon.glsl
hlslPtexCommon.hlsl
mtlPtexCommon.metal
)
set(EXAMPLES_COMMON_PTEX_INC_FILES )
if(EXAMPLES_COMMON_PTEX_SHADER_FILES)
osd_stringify("${EXAMPLES_COMMON_PTEX_SHADER_FILES}"
EXAMPLES_COMMON_PTEX_INC_FILES)
source_group("Shaders" FILES ${EXAMPLES_COMMON_PTEX_SHADER_FILES})
source_group("Inc" FILES ${EXAMPLES_COMMON_PTEX_INC_FILES})
endif()
include_directories( "${PTEX_INCLUDE_DIR}" )
add_library(examples_common_ptex_obj
OBJECT
${EXAMPLES_COMMON_PTEX_SOURCE_FILES}
${EXAMPLES_COMMON_PTEX_HEADER_FILES}
${EXAMPLES_COMMON_PTEX_INC_FILES}
)
set_target_properties(examples_common_ptex_obj
PROPERTIES
FOLDER "examples"
)
endif()
#-------------------------------------------------------------------------------
@ -182,20 +202,10 @@ include_directories(
"${CMAKE_CURRENT_BINARY_DIR}"
)
set(INC_FILES )
if(OPENGL_FOUND OR DXSDK_FOUND OR METAL_FOUND)
osd_stringify("${EXAMPLES_COMMON_SHADER_FILES}" INC_FILES)
source_group("Shaders" FILES ${EXAMPLES_COMMON_SHADER_FILES})
source_group("Inc" FILES ${INC_FILES})
endif()
add_library(examples_common_obj
OBJECT
${EXAMPLES_COMMON_SOURCE_FILES}
${EXAMPLES_COMMON_HEADER_FILES}
${INC_FILES}
)
set_target_properties(examples_common_obj
@ -203,5 +213,3 @@ set_target_properties(examples_common_obj
FOLDER "examples"
)

1
examples/dxPtexViewer/CMakeLists.txt
View File

@ -70,6 +70,7 @@ osd_add_possibly_cuda_executable(dxPtexViewer "examples" WIN32
$<TARGET_OBJECTS:regression_common_obj>
$<TARGET_OBJECTS:regression_far_utils_obj>
$<TARGET_OBJECTS:examples_common_obj>
$<TARGET_OBJECTS:examples_common_ptex_obj>
)
target_link_libraries(dxPtexViewer

1
examples/glPtexViewer/CMakeLists.txt
View File

@ -66,6 +66,7 @@ osd_add_glfw_executable(glPtexViewer "examples"
"${INC_FILES}"
$<TARGET_OBJECTS:regression_common_obj>
$<TARGET_OBJECTS:examples_common_obj>
$<TARGET_OBJECTS:examples_common_ptex_obj>
)
target_link_libraries(glPtexViewer

1
examples/mtlPtexViewer/CMakeLists.txt
View File

@ -99,6 +99,7 @@ osd_add_executable(mtlPtexViewer "examples/mtlPtexViewer"
$<TARGET_OBJECTS:regression_common_obj>
$<TARGET_OBJECTS:regression_far_utils_obj>
$<TARGET_OBJECTS:examples_common_obj>
$<TARGET_OBJECTS:examples_common_ptex_obj>
)

7
opensubdiv/CMakeLists.txt
View File

@ -42,13 +42,6 @@ if (NOT NO_LIB)
)
#---------------------------------------------------------------------------
if( PTEX_FOUND )
include_directories( "${PTEX_INCLUDE_DIR}" )
list(APPEND PLATFORM_CPU_LIBRARIES
${PTEX_LIBRARY}
)
endif()
if( OPENMP_FOUND )
if (CMAKE_COMPILER_IS_GNUCXX)
list(APPEND PLATFORM_CPU_LIBRARIES gomp)