Merge pull request Autodesk#70 from rnd/fix_rpath_2

Inject common LD_LIBRARY_PATH vars into add_maya_test

cmake/test.cmake

@@ -32,6 +32,7 @@ endfunction()
 #                            MAYA_PLUG_IN_PATH
 #                            MAYA_SCRIPT_PATH
 #                            PXR_PLUGINPATH_NAME
+#                            LD_LIBRARY_PATH
 #                        Note that the format of these name/value pairs should
 #                        be the same as that used with
 #                        `set_property(TEST test_name APPEND PROPERTY ENVIRONMENT ...)`
@@ -129,6 +130,7 @@ finally:
         MAYA_PLUG_IN_PATH
         MAYA_SCRIPT_PATH
         PXR_PLUGINPATH_NAME
+        LD_LIBRARY_PATH
     )
 
     # Set initial empty values for all path vars
@@ -178,6 +180,14 @@ finally:
          "${CMAKE_INSTALL_PREFIX}/plugin/al/lib/usd")
     list(APPEND mayaUsd_varname_PXR_PLUGINPATH_NAME
          "${CMAKE_INSTALL_PREFIX}/plugin/al/plugin")
+    if (IS_LINUX AND CMAKE_SKIP_RPATH)
+        list(APPEND mayaUsd_varname_LD_LIBRARY_PATH
+             "$ENV{LD_LIBRARY_PATH}")
+        list(APPEND mayaUsd_varname_LD_LIBRARY_PATH
+             "${CMAKE_INSTALL_PREFIX}/lib")
+        list(APPEND mayaUsd_varname_LD_LIBRARY_PATH
+             "${CMAKE_INSTALL_PREFIX}/plugin/al/lib")
+    endif()
 
     # inherit PATH and PYTHONPATH from ENV to get USD entries
     # these should come last (esp PYTHONPATH, in case another module is overriding

plugin/al/lib/AL_USDMaya/AL/usdmaya/Version.h

@@ -22,7 +22,7 @@
 
 #define AL_USDMAYA_VERSION_MAJOR 1
 #define AL_USDMAYA_VERSION_MINOR 0
-#define AL_USDMAYA_VERSION_PATCH 0
+#define AL_USDMAYA_VERSION_PATCH 2
 
 #define AL_USDMAYA_VERSION_STR xstr(AL_USDMAYA_VERSION_MAJOR) "." \
                                xstr(AL_USDMAYA_VERSION_MINOR) "." \