[a.fixRPATH] Fix broken RPATH for Linux binaries ()

Merging branch 'a.fixRPATH'  into 'main'.

See merge request !2505

.gitlab-ci.yml

@@ -18,10 +18,11 @@ native_Debian:
     - env
     - mkdir build
     - cd build
-    - time cmake .. -GNinja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DZERO_TOLERANCE=ON -DDEVELOPER_CHECKS=ON
-    - time ninja
+    # NOTE: CMake's Ninja generator should not be used with CMake < 3.26 due to internal bugs.
+    - time cmake .. -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DZERO_TOLERANCE=ON -DDEVELOPER_CHECKS=ON
+    - time make -j16
     - time xvfb-run -a ctest -j16 --output-on-failure
-    - time ninja package_source
+    - time make package_source
     - time bash var/mk_wheel_multilinux.sh
     - time cpack -B ./installer .
   artifacts:
@@ -63,7 +64,7 @@ mac_x64:
     - env
     - mkdir build
     - cd build
-    - cmake .. -DCMAKE_PREFIX_PATH="$PYPLAT;$OPTDIR;$QTDIR/lib/cmake;$BREWDIR" -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER="$CCACHE" -DBA_APPLE_BUNDLE=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=11 -DCMAKE_INSTALL_PREFIX=/tmp/ba -DZERO_TOLERANCE=ON
+    - cmake .. -DCMAKE_PREFIX_PATH="$OPTDIR;$QTDIR/lib/cmake;$BREWDIR" -DCMAKE_BUILD_TYPE=Release -DPython3_ROOT_DIR="$PYPLAT" -DCMAKE_CXX_COMPILER_LAUNCHER="$CCACHE" -DBA_APPLE_BUNDLE=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=11 -DCMAKE_INSTALL_PREFIX=/tmp/ba -DZERO_TOLERANCE=ON
     - make -j$NPROC
     - ctest -j3 --output-on-failure
     - python3 var/mac_py_package.py
@@ -126,7 +127,7 @@ windows:
     - pwd
     # configure, make, test, pack
     - cmake --version
-    - cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$PY_PLATFORM_DIR;$OPT_DIR;$QTCMake_DIR" -DCMAKE_INCLUDE_PATH="$BOOST_INCLUDE_DIR" -DCMAKE_LIBRARY_PATH="$BOOST_LIB_DIR" -DCPACK_IFW_ROOT="C:/Qt/Tools/QtInstallerFramework/4.5" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER_LAUNCHER="buildcache.exe" -DCMAKE_CXX_COMPILER_LAUNCHER="buildcache.exe" -B. ..
+    - cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$OPT_DIR;$QTCMake_DIR" -DCMAKE_INCLUDE_PATH="$BOOST_INCLUDE_DIR" -DCMAKE_LIBRARY_PATH="$BOOST_LIB_DIR" -DPython3_ROOT_DIR="$PY_PLATFORM_DIR" -DCPACK_IFW_ROOT="C:/Qt/Tools/QtInstallerFramework/4.5" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER_LAUNCHER="buildcache.exe" -DCMAKE_CXX_COMPILER_LAUNCHER="buildcache.exe" -B. ..
     - pwd
     - if($CI_PIPELINE_SOURCE -eq "schedule") { cmake --build . --target clean; echo "redundant target purge done" }
     - cmake --build . -j20 --config Release

App/CMakeLists.txt

@@ -64,8 +64,8 @@ endif()
 #   See our deployment paper (Nejati et al 2024) for explanation.
 
 if(LINUX)
-    target_link_options(${executable_name} PRIVATE
-        "-Wl,--disable-new-dtags,-rpath,\$ORIGIN/../lib")
+    set(link_flags "-Wl,-rpath,\$ORIGIN/../lib")
+    set_target_properties(${executable_name} PROPERTIES LINK_FLAGS ${link_flags})
 elseif(APPLE)
     set(MACOSX_BUNDLE_IDENTIFIER org.bornagainproject.BornAgain)
     configure_file(${CONFIGURABLES_DIR}/MacOSXBundleInfo.plist.in ${BUILD_VAR_DIR}/Info.plist @ONLY)

GUI/CMakeLists.txt

@@ -31,6 +31,11 @@ set(BornAgain_LIBRARIES "$CACHE{BornAgain_LIBRARIES};${lib_dir}/${libprefix}${li
 # switch OFF Qt debug output in any configuration except DEBUG
 target_compile_definitions(${lib} PUBLIC $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT>)
 
+if(LINUX)
+    set(link_flags "-Wl,-rpath,\$ORIGIN")
+    set_target_properties(${lib} PROPERTIES LINK_FLAGS ${link_flags})
+endif(LINUX)
+
 if(BORNAGAIN_PYTHON)
     target_compile_definitions(${lib} PRIVATE -DBORNAGAIN_PYTHON)
 endif()

cmake/BornAgain/MakeLib.cmake

@@ -68,8 +68,8 @@ function(MakeLib lib swigtmpdir source_files include_files)
     # Set runtime-location of library dependencies
     # See our deployment paper (Nejati et al 2024) for explanation.
     if(LINUX)
-        target_link_options(${lib} PRIVATE
-           "-Wl,--disable-new-dtags,-rpath,\$ORIGIN:\$ORIGIN/extra")
+        set(link_flags "-Wl,--disable-new-dtags,-rpath,\$ORIGIN:\$ORIGIN/../extra")
+        set_target_properties(${lib} PROPERTIES LINK_FLAGS ${link_flags})
     elseif(APPLE)
         target_link_options(${lib} PRIVATE
             "-Wl,-rpath,@loader_path,-rpath,@loader_path/extra")