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

One more fix for the Linux cmake build

Browse Source 
fixes #258
This commit is contained in:
manuelk 2014-04-11 18:33:11 -07:00
parent f65c746294
commit 7bdbf0c8a2
13 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/facePartition/CMakeLists.txt
View File

@ -63,7 +63,7 @@ _add_glfw_executable(facePartition
)
target_link_libraries(facePartition
"${PLATFORM_LIBRARIES}"
${PLATFORM_LIBRARIES}
)
install(TARGETS facePartition DESTINATION "${CMAKE_BINDIR_BASE}")

2
examples/glBatchViewer/CMakeLists.txt
View File

@ -65,7 +65,7 @@ _add_glfw_executable(glBatchViewer
)
target_link_libraries(glBatchViewer
"${PLATFORM_LIBRARIES}"
${PLATFORM_LIBRARIES}
)
install(TARGETS glBatchViewer DESTINATION "${CMAKE_BINDIR_BASE}")

2
examples/glStencilViewer/CMakeLists.txt
View File

@ -51,7 +51,7 @@ _add_glfw_executable(glStencilViewer
)
target_link_libraries(glStencilViewer
"${PLATFORM_LIBRARIES}"
${PLATFORM_LIBRARIES}
)
install(TARGETS glStencilViewer DESTINATION "${CMAKE_BINDIR_BASE}")

2
examples/glViewer/CMakeLists.txt
View File

@ -62,7 +62,7 @@ _add_glfw_executable(glViewer
)
target_link_libraries(glViewer
"${PLATFORM_LIBRARIES}"
${PLATFORM_LIBRARIES}
)
install(TARGETS glViewer DESTINATION "${CMAKE_BINDIR_BASE}")

2
examples/limitEval/CMakeLists.txt
View File

@ -51,7 +51,7 @@ _add_glfw_executable(limitEval
)
target_link_libraries(limitEval
"${PLATFORM_LIBRARIES}"
${PLATFORM_LIBRARIES}
)
install(TARGETS limitEval DESTINATION "${CMAKE_BINDIR_BASE}")

2
examples/osdPolySmooth/CMakeLists.txt
View File

@ -100,7 +100,7 @@ target_link_libraries(maya_polySmoothNode
"${MAYA_OpenMaya_LIBRARY}"
"${MAYA_OpenMayaRender_LIBRARY}"
"${MAYA_OpenMayaUI_LIBRARY}"
"${PLATFORM_LIBRARIES}"
${PLATFORM_LIBRARIES}
)
install(TARGETS maya_polySmoothNode DESTINATION "${CMAKE_PLUGINDIR_BASE}")

2
examples/paintTest/CMakeLists.txt
View File

@ -59,7 +59,7 @@ _add_glfw_executable(paintTest
)
target_link_libraries(paintTest
"${PLATFORM_LIBRARIES}"
${PLATFORM_LIBRARIES}
)
install(TARGETS paintTest DESTINATION "${CMAKE_BINDIR_BASE}")

2
examples/ptexViewer/CMakeLists.txt
View File

@ -81,7 +81,7 @@ _add_glfw_executable(ptexViewer
)
target_link_libraries(ptexViewer
"${PLATFORM_LIBRARIES}"
${PLATFORM_LIBRARIES}
)
install(TARGETS ptexViewer DESTINATION "${CMAKE_BINDIR_BASE}")

2
examples/simpleCpu/CMakeLists.txt
View File

@ -59,7 +59,7 @@ _add_glfw_executable(simpleCpu
)
target_link_libraries(simpleCpu
"${PLATFORM_LIBRARIES}"
${PLATFORM_LIBRARIES}
)
install(TARGETS simpleCpu DESTINATION "${CMAKE_BINDIR_BASE}")

2
examples/tessellateObjFile/CMakeLists.txt
View File

@ -70,7 +70,7 @@ _add_executable(tessellateObjFile
target_link_libraries(tessellateObjFile
osdutil
"${PLATFORM_LIBRARIES}"
${PLATFORM_LIBRARIES}
)
install(TARGETS tessellateObjFile DESTINATION "${CMAKE_BINDIR_BASE}")

2
examples/uvViewer/CMakeLists.txt
View File

@ -63,7 +63,7 @@ _add_glfw_executable(uvViewer
)
target_link_libraries(uvViewer
"${PLATFORM_LIBRARIES}"
${PLATFORM_LIBRARIES}
)
install(TARGETS uvViewer DESTINATION "${CMAKE_BINDIR_BASE}")

36
opensubdiv/osd/CMakeLists.txt
View File

@ -152,7 +152,7 @@ if( PTEX_FOUND )
endif()
include_directories( "${PTEX_INCLUDE_DIR}" )
list(APPEND PLATFORM_CPU_LIBRARIES
"${PTEX_LIBRARY}"
${PTEX_LIBRARY}
)
endif()
@ -203,7 +203,9 @@ if( TBB_FOUND )
list(APPEND PLATFORM_CPU_LIBRARIES gomp)
endif()
list(APPEND PLATFORM_CPU_LIBRARIES "${TBB_LIBRARIES}")
list(APPEND PLATFORM_CPU_LIBRARIES
${TBB_LIBRARIES}
)
endif()
#-------------------------------------------------------------------------------
@ -250,8 +252,8 @@ if( OPENGL_FOUND OR OPENGLES_FOUND )
)
endif()
list(APPEND PLATFORM_GPU_LIBRARIES
"${OPENGL_LIBRARY}"
"${OPENGLES_LIBRARIES}"
${OPENGL_LIBRARY}
${OPENGLES_LIBRARIES}
)
endif()
@ -273,8 +275,12 @@ if( OPENGL_4_2_FOUND )
glslTransformFeedbackKernelBundle.cpp
)
list(APPEND PUBLIC_HEADER_FILES ${GL_4_2_PUBLIC_HEADERS})
list(APPEND KERNEL_FILES glslTransformFeedbackKernel.glsl)
list(APPEND PLATFORM_GPU_LIBRARIES "${GLEW_LIBRARY}")
list(APPEND KERNEL_FILES
glslTransformFeedbackKernel.glsl
)
list(APPEND PLATFORM_GPU_LIBRARIES
${GLEW_LIBRARY}
)
endif()
list(APPEND DOXY_HEADER_FILES ${GL_4_2_PUBLIC_HEADERS})
@ -295,8 +301,12 @@ if( OPENGL_4_3_FOUND )
glslKernelBundle.cpp
)
list(APPEND PUBLIC_HEADER_FILES ${GL_4_3_PUBLIC_HEADERS})
list(APPEND KERNEL_FILES glslComputeKernel.glsl)
list(APPEND PLATFORM_GPU_LIBRARIES "${GLEW_LIBRARY}")
list(APPEND KERNEL_FILES
glslComputeKernel.glsl
)
list(APPEND PLATFORM_GPU_LIBRARIES
${GLEW_LIBRARY}
)
endif()
list(APPEND DOXY_HEADER_FILES ${GL_4_3_PUBLIC_HEADERS})
@ -332,7 +342,9 @@ if( DXSDK_FOUND )
hlslPatchTransition.hlsl
hlslPtexCommon.hlsl
)
list(APPEND PLATFORM_GPU_LIBRARIES "${DXSDK_LIBRARIES}")
list(APPEND PLATFORM_GPU_LIBRARIES
${DXSDK_LIBRARIES}
)
endif()
list(APPEND DOXY_HEADER_FILES ${DXSDK_PUBLIC_HEADERS})
@ -459,7 +471,7 @@ if (NOT NO_LIB)
set_target_properties(osd_static_gpu PROPERTIES OUTPUT_NAME osdGPU CLEAN_DIRECT_OUTPUT 1)
target_link_libraries(osd_static_gpu
"${PLATFORM_CPU_LIBRARIES}" "${PLATFORM_GPU_LIBRARIES}"
${PLATFORM_CPU_LIBRARIES} ${PLATFORM_GPU_LIBRARIES}
)
install( TARGETS osd_static_cpu DESTINATION "${CMAKE_LIBDIR_BASE}" )
@ -489,7 +501,7 @@ if (NOT NO_LIB)
)
target_link_libraries(osd_dynamic_cpu
"${PLATFORM_CPU_LIBRARIES}"
${PLATFORM_CPU_LIBRARIES}
)
_add_possibly_cuda_library(osd_dynamic_gpu
@ -507,7 +519,7 @@ if (NOT NO_LIB)
target_link_libraries(osd_dynamic_gpu
osd_dynamic_cpu
"${PLATFORM_CPU_LIBRARIES}" "${PLATFORM_GPU_LIBRARIES}"
${PLATFORM_CPU_LIBRARIES} ${PLATFORM_GPU_LIBRARIES}
)
install( TARGETS osd_dynamic_cpu LIBRARY DESTINATION "${CMAKE_LIBDIR_BASE}" )

2
regression/osd_regression/CMakeLists.txt
View File

@ -57,7 +57,7 @@ _add_possibly_cuda_executable(osd_regression
add_dependencies(osd_regression blarg )
target_link_libraries(osd_regression
"${PLATFORM_LIBRARIES}"
${PLATFORM_LIBRARIES}
)
install(TARGETS osd_regression DESTINATION "${CMAKE_BINDIR_BASE}")