Squashed 'src/' changes from 982b045..73ab955

73ab955 Fix OSS USD Transaction build Autodesk#2 (Autodesk#947) git-subtree-dir: src git-subtree-split: 73ab955
AnimalLogic · Aug 27, 2019 · 8638909 · 8638909
1 parent 08acf39
commit 8638909
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -97,6 +97,7 @@ set(USDUTILS_INCLUDE_LOCATION ${CMAKE_CURRENT_LIST_DIR}/usdutils)
 set(MAYAUTILS_INCLUDE_LOCATION ${CMAKE_CURRENT_LIST_DIR}/mayautils)
 set(USDMAYAUTILS_INCLUDE_LOCATION ${CMAKE_CURRENT_LIST_DIR}/usdmayautils)
 set(MAYATEST_INCLUDE_LOCATION ${CMAKE_CURRENT_LIST_DIR}/mayatest)
+set(USDTRANSACTION_INCLUDE_LOCATION ${CMAKE_CURRENT_LIST_DIR}/usdtransaction)
 
 add_subdirectory(utils)
 add_subdirectory(usdutils)

diff --git a/plugin/AL_USDMayaTestPlugin/CMakeLists.txt b/plugin/AL_USDMayaTestPlugin/CMakeLists.txt
@@ -70,6 +70,7 @@ target_link_libraries(${PXR_PACKAGE}
     AL_USDUtils
     AL_USDMaya   #Adding this recursively pulls in lots of things
     AL_MayaTest
+    AL_USDMayaSchemas
     AL_USDMayaSchemasTest
     ${GTEST_LIBRARIES}
 )

diff --git a/schemas/AL/usd/schemas/maya/plugInfo.json.in b/schemas/AL/usd/schemas/maya/plugInfo.json.in
@@ -53,6 +53,14 @@
                         "default": "", 
                         "documentation": "A custom maya transform type name to use instead of the built-in AL_usdmaya_Transform node type", 
                         "type": "string"
+                    },
+                    "assettype": {
+                        "appliesTo": [
+                            "prims"
+                        ], 
+                        "default": "", 
+                        "documentation": "Animal Logic AssetType used as a key to register AL_USDMaya Translators against", 
+                        "type": "string"
                     }
                 }, 
                 "Types": {

diff --git a/usdtransaction/AL/usd/transaction/tests/CMakeLists.txt b/usdtransaction/AL/usd/transaction/tests/CMakeLists.txt
@@ -22,7 +22,7 @@ target_link_libraries(${USDTRANSACTION_TEST_EXECUTABLE_NAME}
     arch
     usd
     vt
-    ALboost_python
+    ${boost_python_LIBRARIES}
     ${USDTRANSACTION_LIBRARY_NAME}
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ target_link_libraries(${USDTRANSACTION_TEST_EXECUTABLE_NAME} @@
         arch
         usd
         vt
-        ALboost_python
+        ${boost_python_LIBRARIES}
         ${USDTRANSACTION_LIBRARY_NAME}
     )
@@ Expand Down @@