Merge pull request #225 from LumaPictures/pr/base/add_rpath_symlinked…

…_dir linux/rpath: fix relative path finding for symlinked dirs
Autodesk · Feb 5, 2020 · f3224f6 · f3224f6
2 parents a485b5d + fe45ac8
commit f3224f6
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/cmake/utils.cmake b/cmake/utils.cmake
@@ -83,8 +83,10 @@ function(mayaUsd_init_rpath rpathRef origin)
         else()
             set(origin "${CMAKE_INSTALL_PREFIX}/${origin}")
         endif()
-        get_filename_component(origin "${origin}" REALPATH)
     endif()
+    # mayaUsd_add_rpath uses REALPATH, so we must make sure we always
+    # do so here too, to get the right relative path
+    get_filename_component(origin "${origin}" REALPATH)
     set(${rpathRef} "${origin}" PARENT_SCOPE)
 endfunction()