USD on Windows for dev_win_ip

BUILDING.md

@@ -2,11 +2,11 @@ Advanced Build Configuration
 ============================
 
 ## Table of Contents
-- [Optional Components](#Optional-Components)
-- [Third Party Plugins](#Plugins)
-- [Other Build Options](#Other-Build-Options)
-- [USD Developer Options](#USD-Developer-Options)
-- [Optimization Options](#Optimization-Options)
+- [Optional Components](#optional-components)
+- [Third Party Plugins](#third-party-plugins)
+- [Other Build Options](#other-build-options)
+- [USD Developer Options](#usd-developer-options)
+- [Optimization Options](#optimization-options)
 
 ## Optional Components
 
@@ -19,7 +19,7 @@ removes the need for their dependencies when building USD.
 This component contains Hydra, a high-performance graphics rendering engine.
 
 Disable this component by specifying the cmake flag ```PXR_BUILD_IMAGING=FALSE``` when 
-invoking cmake. Disabling this component will also disable the [USD Imaging](#USD-Imaging)
+invoking cmake. Disabling this component will also disable the [USD Imaging](#usd-imaging)
 component.
 
 ##### USD Imaging
@@ -28,10 +28,10 @@ This component provides the USD imaging delegates for Hydra, as well as
 usdview, a standalone native viewer for USD files.
 
 Disable this component by specifying the cmake flag ```PXR_BUILD_USD_IMAGING=FALSE``` when
-invoking cmake. Enabling this component will enable the [Imaging](#Imaging)
+invoking cmake. Enabling this component will enable the [Imaging](#imaging)
 component.
 
-## Plugins
+## Third Party Plugins
 
 USD provides several plugins for integration with third-party software packages,
 including Maya, Katana, and Alembic. There is additional documentation on each plugin 

CMakeLists.txt

@@ -24,6 +24,10 @@ include(CXXDefaults)
 add_definitions(${_PXR_CXX_DEFINITIONS})
 set(CMAKE_CXX_FLAGS ${_PXR_CXX_FLAGS})
 
+if(POLICY CMP0020)
+    cmake_policy(SET CMP0020 OLD)
+endif()
+
 include(Public)
 
 add_subdirectory(pxr)

CONTRIBUTING.md

@@ -0,0 +1,2 @@
+Thank you for your interest in contributing to USD! We ask that
+potential contributors review our guidelines on [contributing](http://openusd.org/docs/Contributing-to-USD.html) before submitting a pull request. 

ISSUE_TEMPLATE.md

@@ -0,0 +1,8 @@
+### System Information (OS, Hardware, etc.)
+
+### Package Versions
+
+### Build Flags
+
+### Steps to Reproduce
+1. 

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+### Description of Change(s)
+
+
+### Included Commit(s)
+- 
+
+### Fixes Issue(s)
+-
+

README.md

@@ -19,7 +19,7 @@ Getting Help
 ------------
 
 Need help understanding certain concepts in USD? See
-[Getting Help with USD](http://openusd.org/docs/Getting-Help-With-USD.html).
+[Getting Help with USD](http://openusd.org/docs/Getting-Help-with-USD.html).
 
 If you are experiencing undocumented problems with the software, 
 please read our [issue guidelines](ISSUES.md) and file a bug via the

cmake/defaults/CXXDefaults.cmake

@@ -26,7 +26,7 @@ include(Version)
 
 if (CMAKE_COMPILER_IS_GNUCXX)
     include(gccdefaults)
-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
     include(clangdefaults)
 elseif(MSVC)
     include(msvcdefaults)

cmake/defaults/Options.cmake

@@ -21,12 +21,14 @@
 # KIND, either express or implied. See the Apache License for the specific
 # language governing permissions and limitations under the Apache License.
 #
+option(PXR_STRICT_BUILD_MODE "Turn on additional warnings. Enforce all warnings as errors." OFF)
 option(PXR_VALIDATE_GENERATED_CODE "Validate script generated code" ON)
 option(PXR_BUILD_IMAGING "Build imaging components" ON)
 option(PXR_BUILD_USD_IMAGING "Build USD imaging components" ON)
-option(PXR_BUILD_KATANA_PLUGIN "Build usd katana plugin" OFF)
-option(PXR_BUILD_MAYA_PLUGIN "Build usd maya plugin" OFF)
+option(PXR_BUILD_KATANA_PLUGIN "Build usd katana plugin" ON)
+option(PXR_BUILD_MAYA_PLUGIN "Build usd maya plugin" ON)
 option(PXR_BUILD_ALEMBIC_PLUGIN "Build the Alembic plugin for USD" OFF)
+option(PXR_MAYA_TBB_BUG_WORKAROUND "Turn on linker flag (-Wl,-Bsymbolic) to work around a Maya TBB bug" OFF)
 
 set(PXR_INSTALL_LOCATION ""
     CACHE

cmake/defaults/Packages.cmake

@@ -30,10 +30,12 @@ find_package(PythonInterp 2.7 REQUIRED)
 # --Boost
 find_package(Boost
     COMPONENTS
+        date_time
         iostreams
         python
         regex
         system
+        thread
         program_options
     REQUIRED
 )
@@ -58,17 +60,27 @@ find_library(M_LIB m)
 find_package(Jinja2)
 
 if (NOT PXR_MALLOC_LIBRARY)
-    message(STATUS "Using default system allocator because PXR_MALLOC_LIBRARY is unspecified") 
+    if (NOT WIN32)
+        message(STATUS "Using default system allocator because PXR_MALLOC_LIBRARY is unspecified")
+    endif()
 endif()
 
 # Developer Options Package Requirements
 # ----------------------------------------------
 if (PXR_VALIDATE_GENERATED_CODE)
-    find_package(BISON 2.4.1 EXACT)
+    if(WIN32)
+        find_package(BISON 2.7 EXACT)
+    else()
+        find_package(BISON 2.4.1 EXACT)
+    endif()
     # Flex 2.5.39+ is required, generated API is generated incorrectly in
     # 2.5.35, at least. scan_bytes generates with (..., int len, ...) instead of
     # the correct (..., yy_size_t len, ...).  Lower at your own peril.
-    find_package(FLEX 2.5.39 EXACT)
+    if(WIN32)
+        find_package(FLEX 2.5.37 EXACT)
+    else()
+        find_package(FLEX 2.5.39 EXACT)
+    endif()
 endif()
 
 
@@ -85,13 +97,17 @@ if (PXR_BUILD_IMAGING)
     find_package(OpenSubdiv 3 REQUIRED)
     # --Ptex
     find_package(PTex REQUIRED)
-    # --X11
-    find_package(X11)
+    if(UNIX)
+        # --X11
+        find_package(X11)
+    endif()
     # --Qt
     find_package(Qt4)
     if (QT4_FOUND)
-        find_package(PySideTools REQUIRED)
+        find_package(PySide REQUIRED)
     endif()
+    # --Zlib
+    find_package(ZLIB REQUIRED)
 endif()
 
 # Third Party Plugin Package Requirements

cmake/defaults/ProjectDefaults.cmake

@@ -55,4 +55,4 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 # Enable CTest
-enable_testing()
+# enable_testing()

cmake/defaults/clangdefaults.cmake

@@ -21,14 +21,10 @@
 # KIND, either express or implied. See the Apache License for the specific
 # language governing permissions and limitations under the Apache License.
 #
-# By default, Release flavor builds in cmake set NDEBUG, which
-# breaks things internally.  Turn it off.
-set(CMAKE_CXX_FLAGS_RELEASE "-O2")
 
-# Initialize to c++11, pxr won't build without it.
-set(_PXR_CXX_FLAGS "-std=c++11 -DTF_NO_GNU_EXT -Wall -Wno-unused-local-typedefs")
-
-# We use hash_map, suppress deprecation warning.
-_add_warning_flag("no-deprecated")
-_add_warning_flag("no-deprecated-declarations")
+include(gccclangshareddefaults)
 
+# Defining TF_NO_GNU_EXT disables using the gnu hash_set and 
+# hash_map containers on platforms where we can't. The implementation
+# will substitute C++11 containers with equivalent semantics in this case.
+set(_PXR_CXX_FLAGS "${_PXR_GCC_CLANG_SHARED_CXX_FLAGS} -DTF_NO_GNU_EXT")

cmake/defaults/gccclangshareddefaults.cmake

@@ -0,0 +1,51 @@
+#
+# Copyright 2016 Pixar
+#
+# Licensed under the Apache License, Version 2.0 (the "Apache License")
+# with the following modification; you may not use this file except in
+# compliance with the Apache License and the following modification to it:
+# Section 6. Trademarks. is deleted and replaced with:
+#
+# 6. Trademarks. This License does not grant permission to use the trade
+#    names, trademarks, service marks, or product names of the Licensor
+#    and its affiliates, except as required to comply with Section 4(c) of
+#    the License and to reproduce the content of the NOTICE file.
+#
+# You may obtain a copy of the Apache License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the Apache License with the above modification is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the Apache License for the specific
+# language governing permissions and limitations under the Apache License.
+#
+
+# This file contains a set of flags/settings shared between our 
+# GCC and Clang configs. This allows clangdefaults and gccdefaults
+# to remain minimal, marking the points where divergence is required.
+include(Options)
+
+# By default, Release flavor builds in cmake set NDEBUG, which
+# breaks things internally.  Turn it off.
+set(CMAKE_CXX_FLAGS_RELEASE "-O2")
+
+# Enable all warnings
+_add_warning_flag("all")
+# We use hash_map, suppress deprecation warning.
+_add_warning_flag("no-deprecated")
+_add_warning_flag("no-deprecated-declarations")
+# Suppress unused typedef warnings eminating from boost.
+_add_warning_flag("no-unused-local-typedefs")
+
+# Turn on C++11, pxr won't build without it. 
+set(_PXR_GCC_CLANG_SHARED_CXX_FLAGS "-std=c++11")
+
+if (${PXR_MAYA_TBB_BUG_WORKAROUND})
+    set(_PXR_GCC_CLANG_SHARED_CXX_FLAGS "${_PXR_GCC_CLANG_SHARED_CXX_FLAGS} -Wl,-Bsymbolic")
+endif()
+
+if (${PXR_STRICT_BUILD_MODE})
+    _add_warning_flag("error")
+endif()

cmake/defaults/gccdefaults.cmake

@@ -21,15 +21,7 @@
 # KIND, either express or implied. See the Apache License for the specific
 # language governing permissions and limitations under the Apache License.
 #
-# By default, Release flavor builds in cmake set NDEBUG, which
-# breaks things internally.  Turn it off.
-set(CMAKE_CXX_FLAGS_RELEASE "-O2")
 
-# Initialize to c++11, pxr won't build without it.
-# Turn on all warnings and convert them to errors.
-set(_PXR_CXX_FLAGS "-std=c++11 -Wall -Wno-unused-local-typedefs")
-
-# We use hash_map, suppress deprecation warning.
-_add_warning_flag("no-deprecated")
-_add_warning_flag("no-deprecated-declarations")
+include(gccclangshareddefaults)
 
+set(_PXR_CXX_FLAGS "${_PXR_GCC_CLANG_SHARED_CXX_FLAGS}")

cmake/defaults/msvcdefaults.cmake

@@ -22,9 +22,67 @@
 # language governing permissions and limitations under the Apache License.
 #
 
+# Make sure WinDef.h does not define min and max macros which
+# will conflict with std::min() and std::max().
+add_definitions("/DNOMINMAX") 
+
+# TBB conflict
+# This needs to be enabled only for debug builds
+# add_definitions("/DTBB_USE_DEBUG=1")
+
+# Allow "Unsecure" STL
+add_definitions("/D_SCL_SECURE_NO_WARNINGS")
+
+# Needed for consistency with Linux for the use of hashmap and hashset
+add_definitions("/DTF_NO_GNU_EXT")
+
+# Needed to prevent YY files trying to import Unistd.h
+# (which doesn't exist on Windows)
+add_definitions("/DYY_NO_UNISTD_H")
+
+# Forces all libraries that have separate source, to be linked as
+# DLL's rather than static libraries on Microsoft Window.
+add_definitions("/DBOOST_ALL_DYN_LINK")
+
+add_definitions("/DBUILD_OPTLEVEL_OPT")
+
+add_definitions(/"DFLAVOR=\"win64\"")
+
+add_definitions(/"DOPENEXR_DLL")
+
 # Set a decent warning level
 add_definitions("/W3")
 
 # Treat all warnings as errors
 add_definitions("/WX")
 
+# trunctation from 'double' to 'float' due to matrix and vector classes in `Gf`
+add_definitions("/wd4244")
+add_definitions("/wd4305")
+
+# conversion from size_t to int. Whilst we don't want this enabled
+# its in the Python headers. So all the Python wrap code is affected.
+add_definitions("/wd4267")
+
+# no definition for inline function
+# this affects Glf only
+add_definitions("/wd4506")
+
+# Enable PDB generation
+add_definitions("/Zi")
+
+# Enable minimum builds
+add_definitions("/Gm")
+
+# These files require /bigobj compiler flag
+#   Vt/arrayPyBuffer.cpp
+#   Usd/crateFile.cpp
+#   Usd/stage.cpp
+# Until we can set the flag on a per file basis, we'll have to enable it
+# for all translation units.
+add_definitions("/bigobj")
+
+if (${PXR_STRICT_BUILD_MODE})
+    # Treat all warnings as errors
+    add_definitions("/WX")
+endif()