fix(build): Fix recently broken rpath setting

src/cmake/compiler.cmake

@@ -698,7 +698,8 @@ else ()
         else()
             set(BASEPOINT $ORIGIN)
         endif()
-        set (CMAKE_INSTALL_RPATH ${BASEPOINT} ${BASEPOINT}/${CMAKE_INSTALL_LIBDIR})
+        set (CMAKE_INSTALL_RPATH ${BASEPOINT}
+                                 ${BASEPOINT}/../${CMAKE_INSTALL_LIBDIR})
     endif ()
     # add the automatically determined parts of the RPATH that
     # point to directories outside the build tree to the install RPATH

src/cmake/fancy_add_executable.cmake

@@ -53,12 +53,6 @@ macro (fancy_add_executable)
         target_link_libraries (${_target_NAME} PRIVATE ${_target_LINK_LIBRARIES})
         target_link_libraries (${_target_NAME} PRIVATE ${PROFILER_LIBRARIES})
         set_target_properties (${_target_NAME} PROPERTIES FOLDER ${_target_FOLDER})
-        if (SKBUILD) 
-            # The installed bin and lib directories are at the same level, so we
-            # need to set the rpath to look for the libraries in ../lib
-            set_target_properties (${_target_NAME} PROPERTIES
-                INSTALL_RPATH "$<IF:$<BOOL:${APPLE}>,@loader_path,$ORIGIN>/../${CMAKE_INSTALL_LIBDIR}")
-        endif ()
         check_is_enabled (INSTALL_${_target_NAME} _target_NAME_INSTALL_enabled)
         if (CMAKE_UNITY_BUILD AND UNITY_BUILD_MODE STREQUAL GROUP)
             set_source_files_properties(${_target_SRC} PROPERTIES

src/libutil/CMakeLists.txt

@@ -107,8 +107,6 @@ function (setup_oiio_util_library targetname)
 
     if (SKBUILD)
         set (PYTHON_SITE_DIR .)
-        set_target_properties (${targetname} PROPERTIES
-                INSTALL_RPATH "$<IF:$<BOOL:${APPLE}>,@loader_path,$ORIGIN>/${CMAKE_INSTALL_LIBDIR}")
         install_targets (NAMELINK_SKIP ${targetname})
     else ()
         install_targets (${targetname})