Benjamin Greiner
f2e21a5009
- add no-static.patch:
disable all static libraries
- Update to 3.6.1:
- Changes
- Updated CMake minimum version to 3.14 (GitHub #1349)
- Updated documentation regarding external dependencies (GitHub
#1346 #1360)
- Updated API and example documentation (GitHub #1351 #1362)
- Updated build_osd.py visual studio discovery and dependent
package versions (GitHub #1333 #1354 #1361)
- Updated azure pipelines agents (GitHub #1337 #1342 #1355
#1361)
- Updated use of OpenCL in example viewers (GitHub #1357)
- Addressed Clang 16 compiler warnings (GitHub #1356)
- Addressed some address sanitizer build warnings (GitHub
#1343)
- Added configuration options to build Osd patch shader source
independent of other Osd dependencies (GitHub #1359 #1363)
- Bug Fixes
- Fixed evaluation of surface patches at valence-2 darts
(GitHub #1336)
- Fixed sharpening of vertices on potential non-manifold
creases (GitHub #1338)
- Fixed sharing of Bfr::Surface topology with valence-2
interior vertices (GitHub #1353)
OBS-URL: https://build.opensuse.org/package/show/graphics/OpenSubdiv?expand=0&rev=18
126 lines
4.2 KiB
Diff
126 lines
4.2 KiB
Diff
diff --git a/opensubdiv/CMakeLists.txt b/opensubdiv/CMakeLists.txt
|
|
index eb13cc1d..e72d3475 100644
|
|
--- a/opensubdiv/CMakeLists.txt
|
|
+++ b/opensubdiv/CMakeLists.txt
|
|
@@ -120,63 +120,63 @@ if (NOT NO_LIB)
|
|
|
|
#---------------------------------------------------------------------------
|
|
|
|
- # Build static libs ------------------------------------
|
|
- add_library(osd_static_cpu
|
|
- STATIC
|
|
- version.cpp
|
|
- $<TARGET_OBJECTS:sdc_obj>
|
|
- $<TARGET_OBJECTS:vtr_obj>
|
|
- $<TARGET_OBJECTS:far_obj>
|
|
- $<TARGET_OBJECTS:bfr_obj>
|
|
- $<TARGET_OBJECTS:osd_cpu_obj>
|
|
- )
|
|
-
|
|
- set_target_properties(osd_static_cpu
|
|
- PROPERTIES
|
|
- OUTPUT_NAME osdCPU
|
|
- EXPORT_NAME osdCPU_static
|
|
- CLEAN_DIRECT_OUTPUT 1
|
|
- FOLDER "opensubdiv"
|
|
- )
|
|
-
|
|
- target_include_directories(osd_static_cpu
|
|
- INTERFACE
|
|
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
|
- )
|
|
-
|
|
- target_link_libraries(osd_static_cpu
|
|
- ${PLATFORM_CPU_LIBRARIES}
|
|
- )
|
|
-
|
|
- install( TARGETS osd_static_cpu EXPORT opensubdiv-targets DESTINATION "${CMAKE_LIBDIR_BASE}" )
|
|
-
|
|
- if( OSD_GPU )
|
|
- # this macro uses FindCUDA.cmake to compile .cu kernel files
|
|
- # the target then adds the other obj dependencies and include files
|
|
- osd_add_possibly_cuda_library(osd_static_gpu "opensubdiv"
|
|
- STATIC
|
|
- version.cpp
|
|
- $<TARGET_OBJECTS:osd_gpu_obj>
|
|
- ${OPENGL_LOADER_OBJS}
|
|
- ${CUDA_KERNEL_FILES}
|
|
- )
|
|
- set_target_properties(osd_static_gpu
|
|
- PROPERTIES
|
|
- OUTPUT_NAME osdGPU
|
|
- EXPORT_NAME osdGPU_static
|
|
- CLEAN_DIRECT_OUTPUT 1)
|
|
-
|
|
- target_include_directories(osd_static_gpu
|
|
- INTERFACE
|
|
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
|
- )
|
|
-
|
|
- target_link_libraries(osd_static_gpu
|
|
- ${PLATFORM_CPU_LIBRARIES} ${PLATFORM_GPU_LIBRARIES}
|
|
- )
|
|
-
|
|
- install( TARGETS osd_static_gpu EXPORT opensubdiv-targets DESTINATION "${CMAKE_LIBDIR_BASE}" )
|
|
- endif()
|
|
+ # # Build static libs ------------------------------------
|
|
+ # add_library(osd_static_cpu
|
|
+ # STATIC
|
|
+ # version.cpp
|
|
+ # $<TARGET_OBJECTS:sdc_obj>
|
|
+ # $<TARGET_OBJECTS:vtr_obj>
|
|
+ # $<TARGET_OBJECTS:far_obj>
|
|
+ # $<TARGET_OBJECTS:bfr_obj>
|
|
+ # $<TARGET_OBJECTS:osd_cpu_obj>
|
|
+ # )
|
|
+ #
|
|
+ # set_target_properties(osd_static_cpu
|
|
+ # PROPERTIES
|
|
+ # OUTPUT_NAME osdCPU
|
|
+ # EXPORT_NAME osdCPU_static
|
|
+ # CLEAN_DIRECT_OUTPUT 1
|
|
+ # FOLDER "opensubdiv"
|
|
+ # )
|
|
+ #
|
|
+ # target_include_directories(osd_static_cpu
|
|
+ # INTERFACE
|
|
+ # $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
|
+ # )
|
|
+ #
|
|
+ # target_link_libraries(osd_static_cpu
|
|
+ # ${PLATFORM_CPU_LIBRARIES}
|
|
+ # )
|
|
+ #
|
|
+ # install( TARGETS osd_static_cpu EXPORT opensubdiv-targets DESTINATION "${CMAKE_LIBDIR_BASE}" )
|
|
+
|
|
+ # if( OSD_GPU )
|
|
+ # # this macro uses FindCUDA.cmake to compile .cu kernel files
|
|
+ # # the target then adds the other obj dependencies and include files
|
|
+ # osd_add_possibly_cuda_library(osd_static_gpu "opensubdiv"
|
|
+ # STATIC
|
|
+ # version.cpp
|
|
+ # $<TARGET_OBJECTS:osd_gpu_obj>
|
|
+ # ${OPENGL_LOADER_OBJS}
|
|
+ # ${CUDA_KERNEL_FILES}
|
|
+ # )
|
|
+ # set_target_properties(osd_static_gpu
|
|
+ # PROPERTIES
|
|
+ # OUTPUT_NAME osdGPU
|
|
+ # EXPORT_NAME osdGPU_static
|
|
+ # CLEAN_DIRECT_OUTPUT 1)
|
|
+ #
|
|
+ # target_include_directories(osd_static_gpu
|
|
+ # INTERFACE
|
|
+ # $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
|
+ # )
|
|
+ #
|
|
+ # target_link_libraries(osd_static_gpu
|
|
+ # ${PLATFORM_CPU_LIBRARIES} ${PLATFORM_GPU_LIBRARIES}
|
|
+ # )
|
|
+ #
|
|
+ # install( TARGETS osd_static_gpu EXPORT opensubdiv-targets DESTINATION "${CMAKE_LIBDIR_BASE}" )
|
|
+ # endif()
|
|
|
|
|
|
# Build dynamic libs ----------------------------------
|