diff --git a/examples/mtlPtexViewer/CMakeLists.txt b/examples/mtlPtexViewer/CMakeLists.txt index f8e51ff7..a8621d7e 100644 --- a/examples/mtlPtexViewer/CMakeLists.txt +++ b/examples/mtlPtexViewer/CMakeLists.txt @@ -73,7 +73,7 @@ list(APPEND PLATFORM_FILES ) list(APPEND PLATFORM_LIBRARIES - "osd_static_framework" + "osd_dynamic_framework" "${METAL_LIBRARY}" "-framework MetalKit" "-framework Foundation" diff --git a/examples/mtlViewer/CMakeLists.txt b/examples/mtlViewer/CMakeLists.txt index c1445954..aa274c81 100644 --- a/examples/mtlViewer/CMakeLists.txt +++ b/examples/mtlViewer/CMakeLists.txt @@ -71,7 +71,7 @@ list(APPEND PLATFORM_FILES ) list(APPEND PLATFORM_LIBRARIES - "osd_static_framework" + "osd_dynamic_framework" "${METAL_LIBRARY}" "-framework MetalKit" "-framework Foundation" diff --git a/opensubdiv/CMakeLists.txt b/opensubdiv/CMakeLists.txt index 4f97e68e..be0aecac 100644 --- a/opensubdiv/CMakeLists.txt +++ b/opensubdiv/CMakeLists.txt @@ -145,8 +145,6 @@ if (NOT NO_LIB) ${PLATFORM_CPU_LIBRARIES} ) - install( TARGETS osd_static_cpu 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 @@ -162,8 +160,6 @@ if (NOT NO_LIB) target_link_libraries(osd_static_gpu ${PLATFORM_CPU_LIBRARIES} ${PLATFORM_GPU_LIBRARIES} ) - - install( TARGETS osd_static_gpu DESTINATION "${CMAKE_LIBDIR_BASE}" ) endif() @@ -295,26 +291,6 @@ if (NOT NO_LIB) ${PLATFORM_CPU_LIBRARIES} ${PLATFORM_GPU_LIBRARIES} ) - install( TARGETS osd_static_framework - LIBRARY DESTINATION "${CMAKE_LIBDIR_BASE}" - FRAMEWORK DESTINATION "${CMAKE_LIBDIR_BASE}" - PUBLIC_HEADER DESTINATION "${CMAKE_INCDIR_BASE}" - ARCHIVE DESTINATION "${CMAKE_LIBDIR_BASE}") - - foreach(file ${PUBLIC_HEADER_FILES}) - add_custom_command(TARGET osd_static_framework POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy - "${CMAKE_SOURCE_DIR}/opensubdiv/${file}" - "$/Headers/${file}" - ) - endforeach(file) - - add_custom_command(TARGET osd_static_framework POST_BUILD - COMMAND ln -sf - "Versions/Current/Headers" - "$/../../Headers" - ) - #shared framework if (BUILD_SHARED_LIBS) add_library(osd_dynamic_framework diff --git a/tutorials/osd/tutorial_0/CMakeLists.txt b/tutorials/osd/tutorial_0/CMakeLists.txt index 6edac1df..8c09d669 100644 --- a/tutorials/osd/tutorial_0/CMakeLists.txt +++ b/tutorials/osd/tutorial_0/CMakeLists.txt @@ -32,7 +32,7 @@ osd_add_executable(osd_tutorial_0 "tutorials/osd" target_link_libraries(osd_tutorial_0 - osd_static_cpu + osd_dynamic_cpu ) install(TARGETS osd_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")