diff --git a/build_scripts/windows_build.bat b/build_scripts/windows_build.bat index a049805fa5..0806e4d171 100644 --- a/build_scripts/windows_build.bat +++ b/build_scripts/windows_build.bat @@ -11,6 +11,7 @@ cd build cmake -DCMAKE_INSTALL_PREFIX=%WORKSPACE%\install ^ -DCMAKE_BUILD_TYPE=Release ^ -DBOOST_ROOT=%USD_DEPENDENCIES_ROOT% ^ + -Dboost_NAMESPACE=boost ^ -DMAYA_LOCATION="C:\Program Files\Autodesk\Maya2017" ^ -DUSD_ROOT=%USD_ROOT% ^ -DUSD_MAYA_ROOT=%USD_ROOT% ^ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 84d1bb8f08..675e9b571d 100644 --- a/src/CMakeLists.txt +++ b/src/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/src/plugin/AL_USDMayaTestPlugin/CMakeLists.txt b/src/plugin/AL_USDMayaTestPlugin/CMakeLists.txt index f61a9c2999..8de238b0d7 100644 --- a/src/plugin/AL_USDMayaTestPlugin/CMakeLists.txt +++ b/src/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/src/schemas/AL/usd/schemas/maya/plugInfo.json.in b/src/schemas/AL/usd/schemas/maya/plugInfo.json.in index 1b15724225..db71d1f243 100644 --- a/src/schemas/AL/usd/schemas/maya/plugInfo.json.in +++ b/src/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/src/usdtransaction/AL/usd/transaction/tests/CMakeLists.txt b/src/usdtransaction/AL/usd/transaction/tests/CMakeLists.txt index 2ab1fa05e0..221e70a7ed 100644 --- a/src/usdtransaction/AL/usd/transaction/tests/CMakeLists.txt +++ b/src/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} )