target_link_options instead of setting property

App/CMakeLists.txt

@@ -59,8 +59,8 @@ if(WIN32)
 endif()
 
 if(LINUX)
-    set(link_flags "-Wl,--disable-new-dtags,-rpath,\$ORIGIN/../lib")
-    set_target_properties(${executable_name} PROPERTIES LINK_OPTIONS ${link_flags})
+    target_link_options(${executable_name} PRIVATE
+        "-Wl,--disable-new-dtags,-rpath=\$ORIGIN/../lib")
 endif()
 
 if(APPLE)
@@ -71,14 +71,11 @@ if(APPLE)
         PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${BUILD_VAR_DIR}/Info.plist)
 
     if(BA_APPLE_BUNDLE)
-        set(link_flags
-            "-Wl,-rpath,@loader_path/../lib -Wl,-rpath,@loader_path/../Frameworks/ \
--Wl,-rpath,@loader_path/../lib/BornAgain-${PROJECT_VERSION}/")
-    else()
-        set(link_flags "-Wl,-rpath,\
-@loader_path/../../../lib/BornAgain-${PROJECT_VERSION}/")
+        target_link_options(${executable_name} PRIVATE
+            "-Wl,-rpath,@loader_path/../lib:@loader_path/../Frameworks")
     endif()
-    set_target_properties(${executable_name} PROPERTIES LINK_OPTIONS ${link_flags})
+    target_link_options(${executable_name} PRIVATE
+        "-Wl,-rpath,@loader_path/../../../lib/BornAgain-${PROJECT_VERSION}")
 endif()
 
 # -----------------------------------------------------------------------------

cmake/BornAgain/MakeLib.cmake

@@ -68,17 +68,18 @@ function(MakeLib lib)
 
     get_target_property(lib_dir ${lib} LIBRARY_OUTPUT_DIRECTORY)
     get_target_property(lib_name ${lib} _BASEFILENAME)
-    set(BornAgain_LIBRARIES "$CACHE{BornAgain_LIBRARIES};${lib_dir}/${lib_name}" CACHE INTERNAL "BornAgain libraries")
+    set(BornAgain_LIBRARIES "$CACHE{BornAgain_LIBRARIES};${lib_dir}/${lib_name}"
+        CACHE INTERNAL "BornAgain libraries")
 
 
     # Set runtime-location of library dependencies
     if(LINUX)
-        set(link_flags "-Wl,--disable-new-dtags,-rpath,\$ORIGIN:\$ORIGIN/extra")
-        set_target_properties(${lib} PROPERTIES LINK_OPTIONS ${link_flags})
+        target_link_options(${lib} PRIVATE
+           "-Wl,--disable-new-dtags,-rpath,\$ORIGIN:\$ORIGIN/extra")
     endif()
     if(APPLE AND (BA_APPLE_BUNDLE OR BA_WHEEL))
-        set(link_flags "-Wl,-rpath,@loader_path -Wl,-rpath,@loader_path/extra")
-        set_target_properties(${lib} PROPERTIES LINK_OPTIONS ${link_flags})
+        target_link_options(${lib} PRIVATE
+            "-Wl,-rpath,@loader_path:@loader_path/extra")
     endif()