Merge branch 'dev' into sabrih/MAYA-103926/compiler_configuration_may…

…ausd
Autodesk · Apr 19, 2020 · 9437400 · 9437400
2 parents 9cc329b + ec3853c
commit 9437400
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 22 deletions.
diff --git a/plugin/pxr/cmake/defaults/CXXDefaults.cmake b/plugin/pxr/cmake/defaults/CXXDefaults.cmake
@@ -14,7 +14,6 @@
 # limitations under the License.
 #
 include(CXXHelpers)
-include(Version)
 include(Options)
 
 # Require C++14 if we're either building for Maya 2019 or later, or if we're

diff --git a/plugin/pxr/cmake/defaults/Version.cmake b/plugin/pxr/cmake/defaults/Version.cmake