Merge branch 'master' of github.com:PixarAnimationStudios/OpenSubdiv

CMakeLists.txt

@@ -110,11 +110,18 @@ endif()
 
 find_package(Maya)
 
+# Link examples & regressions dynamically against Osd
+set( OSD_LINK_TARGET osd_dynamic )
 
-add_definitions(
+if (WIN32)
-    # GLEW gets built as a static library.
+    add_definitions(
-    -DGLEW_STATIC
+        # GLEW gets built as a static library in Windows
-)
+        -DGLEW_STATIC
+    )
+    # Link examples & regressions statically against Osd for
+    # Windows until all the kinks can be worked out.
+    set( OSD_LINK_TARGET osd_static )
+endif()
 
 if(MSVC)
     # MSVC is unfortunately not standard conforming with regards to

examples/glutViewer/CMakeLists.txt

@@ -58,7 +58,7 @@
 # *** glutViewer ***
 
 set(PLATFORM_LIBRARIES 
-    osd
+    ${OSD_LINK_TARGET}
     ${ILMBASE_LIBS_DIRECTORY}
     ${OPENGL_LIBRARY}
     ${GLUT_LIBRARIES}

examples/mayaViewer/CMakeLists.txt

@@ -131,7 +131,7 @@ set_target_properties(maya_plugin
 )
 
 target_link_libraries(maya_plugin
-    osd
+    ${OSD_LINK_TARGET}
     ${MAYA_Foundation_LIBRARY}
     ${MAYA_OpenMaya_LIBRARY}
     ${MAYA_OpenMayaRender_LIBRARY}

opensubdiv/CMakeLists.txt

@@ -58,9 +58,10 @@
 add_subdirectory(tools/stringify)
 
 add_subdirectory(hbr)
-add_subdirectory(far)
-add_subdirectory(osd)
 
+add_subdirectory(far)
+
+add_subdirectory(osd)
 
 install( FILES version.h
          DESTINATION include/

opensubdiv/osd/CMakeLists.txt

@@ -93,7 +93,6 @@ set(PUBLIC_HEADER_FILES
     vertexBuffer.h
 )
 
-
 #-------------------------------------------------------------------------------
 # platform dependent tweaks
 if(APPLE)
@@ -151,13 +150,13 @@ if( OPENGL_FOUND AND GLEW_FOUND AND (NOT APPLE) )
 else()
     message(STATUS
         "* OpenGL was not found : support for GLSL parallel compute kernels will be disabled "
-        "in Osd. If you have an OpenGL SDK installed(version 4.2 or above), please refer to "
+        "in Osd. If you have an OpenGL SDK installed (version 4.2 or above), please refer to "
         "the FindOpenGL.cmake shared module in your cmake installation.")
 endif()
 
 #-------------------------------------------------------------------------------
 # OpenCL code & dependencies 
-if ( OPENCL_FOUND)
+if ( OPENCL_FOUND )
     list(APPEND SOURCE_FILES
         clDispatcher.cpp
     )
@@ -234,20 +233,40 @@ endforeach()
 
 #-------------------------------------------------------------------------------
 source_group("Kernels" FILES ${KERNEL_FILES})
+
 source_group("Inc" FILES ${INC_FILES})
 
-_add_library(osd STATIC
+_add_library(osd_static STATIC
     ${SOURCE_FILES}
     ${PRIVATE_HEADER_FILES}
     ${PUBLIC_HEADER_FILES}
     ${KERNEL_FILES}
     ${INC_FILES}
 )
+set_target_properties(osd_static PROPERTIES OUTPUT_NAME osd CLEAN_DIRECT_OUTPUT 1)
 
-target_link_libraries(osd
+target_link_libraries(osd_static
     ${PLATFORM_LIBRARIES}
 )
 
+if (NOT WIN32)
+    _add_library(osd_dynamic SHARED
+        ${SOURCE_FILES}
+        ${PRIVATE_HEADER_FILES}
+        ${PUBLIC_HEADER_FILES}
+        ${KERNEL_FILES}
+        ${INC_FILES}
+    )
+
+    set_target_properties(osd_dynamic PROPERTIES OUTPUT_NAME osd CLEAN_DIRECT_OUTPUT 1)
+
+    target_link_libraries(osd_dynamic
+        ${PLATFORM_LIBRARIES}
+    )
+
+endif()
+
+
 install( FILES ${PUBLIC_HEADER_FILES}
          DESTINATION include/osd
          PERMISSIONS OWNER_READ GROUP_READ WORLD_READ )

regression/osd_regression/CMakeLists.txt

@@ -82,7 +82,7 @@ add_executable(osd_regression
 )
 
 target_link_libraries(osd_regression
-    osd
+    ${OSD_LINK_TARGET}
     ${ILMBASE_LIBS_DIRECTORY}
 )