Fix RPATH handling (#122)

Fix rpath handling

- remove explicit add to CMAKE_INSTALL_RPATH
- remove overriding INSTALL_RPATH_USE_LINK_PATH for exes

source/bin/omnitrace-avail/CMakeLists.txt

@@ -28,10 +28,8 @@ target_compile_definitions(omnitrace-avail PRIVATE OMNITRACE_EXTERN_COMPONENTS=0
 target_link_libraries(omnitrace-avail PRIVATE omnitrace::omnitrace-compile-definitions
                                               omnitrace::omnitrace-interface-library)
 set_target_properties(
-    omnitrace-avail
-    PROPERTIES BUILD_RPATH "\$ORIGIN:${PROJECT_BINARY_DIR}:${CMAKE_BINARY_DIR}"
-               INSTALL_RPATH_USE_LINK_PATH ON
-               INSTALL_RPATH "${OMNITRACE_EXE_INSTALL_RPATH}")
+    omnitrace-avail PROPERTIES BUILD_RPATH "\$ORIGIN:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}"
+                               INSTALL_RPATH "${OMNITRACE_EXE_INSTALL_RPATH}")
 
 install(
     TARGETS omnitrace-avail

source/bin/omnitrace-critical-trace/CMakeLists.txt

@@ -19,8 +19,7 @@ target_link_libraries(
             omnitrace::omnitrace-timemory)
 set_target_properties(
     omnitrace-critical-trace
-    PROPERTIES BUILD_RPATH "\$ORIGIN:${PROJECT_BINARY_DIR}:${CMAKE_BINARY_DIR}"
-               INSTALL_RPATH_USE_LINK_PATH ON
+    PROPERTIES BUILD_RPATH "\$ORIGIN:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}"
                INSTALL_RPATH "${OMNITRACE_EXE_INSTALL_RPATH}")
 
 install(

source/bin/omnitrace/CMakeLists.txt

@@ -32,8 +32,7 @@ target_link_libraries(
 set_target_properties(
     omnitrace-exe
     PROPERTIES OUTPUT_NAME omnitrace
-               BUILD_RPATH "\$ORIGIN:${PROJECT_BINARY_DIR}:${CMAKE_BINARY_DIR}"
-               INSTALL_RPATH_USE_LINK_PATH ON
+               BUILD_RPATH "\$ORIGIN:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}"
                INSTALL_RPATH "${OMNITRACE_EXE_INSTALL_RPATH}")
 
 if(OMNITRACE_BUILD_DYNINST)

source/lib/CMakeLists.txt

@@ -8,13 +8,7 @@
 #
 # ----------------------------------------------------------------------------- #
 
-string(REPLACE ":" ";" _INSTALL_RPATH "${CMAKE_INSTALL_RPATH}")
-if(_INSTALL_RPATH)
-    list(REMOVE_DUPLICATES _INSTALL_RPATH)
-endif()
-string(REPLACE ";" ":" _INSTALL_RPATH "${_INSTALL_RPATH}")
-string(REPLACE "::" ":" OMNITRACE_LIB_INSTALL_RPATH
-               "\$ORIGIN:\$ORIGIN/omnitrace:${_INSTALL_RPATH}")
+set(OMNITRACE_LIB_INSTALL_RPATH "\$ORIGIN:\$ORIGIN/omnitrace")
 
 add_subdirectory(common)
 add_subdirectory(omnitrace)

source/python/CMakeLists.txt

@@ -35,7 +35,6 @@ function(OMNITRACE_CONFIGURE_PYTARGET _TARGET _VERSION)
                    ${PROJECT_BINARY_DIR}/lib/python/site-packages/omnitrace
                    PDB_OUTPUT_DIRECTORY
                    ${PROJECT_BINARY_DIR}/lib/python/site-packages/omnitrace
-                   INSTALL_RPATH_USE_LINK_PATH ON
                    ${EXTRA_PROPERTIES})
 
     set(_PYLIB ${CMAKE_INSTALL_PYTHONDIR}/omnitrace)
@@ -50,12 +49,8 @@ function(OMNITRACE_CONFIGURE_PYTARGET _TARGET _VERSION)
              "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
     endif()
 
-    set_target_properties(
-        ${_TARGET}
-        PROPERTIES
-            INSTALL_RPATH
-            "\$ORIGIN:\$ORIGIN/${LIB_RELPATH}:\$ORIGIN/../../../..:${CMAKE_INSTALL_RPATH}"
-        )
+    set_target_properties(${_TARGET} PROPERTIES INSTALL_RPATH
+                                                "\$ORIGIN:\$ORIGIN/${LIB_RELPATH}")
 
     install(
         TARGETS ${_TARGET}