Do not assume Debian-specific CMAKE_INSTALL_RPATH
6df4b6bf
introduced a workaround to allow Ubuntu and Debian packages to
work with default flags, since CPack does not adjust the rpath of the
package executables according to its CPACK_PACKAGING_INSTALL_PREFIX. [1]
However, this workaround caused a regression on those distributions not
using /usr as their CPACK_PACKAGING_INSTALL_PREFIX, such as Guix.
Until CPack is fixed, removing this line forces build-deb.yml to set a
non-default CMAKE_INSTALL_PREFIX that matches
CPACK_PACKAGING_INSTALL_PREFIX.
[1]: https://cmake.org/cmake/help/latest/variable/CPACK_PACKAGING_INSTALL_PREFIX.html
This commit is contained in:
parent
c5b0a2b38a
commit
93ef6ff6b3
2 changed files with 1 additions and 2 deletions
|
@ -25,7 +25,7 @@ jobs:
|
|||
working-directory: /src
|
||||
- name: Configure project
|
||||
working-directory: /src
|
||||
run: cmake -B build -DSD_ASSUME_DATADIR=1
|
||||
run: cmake -B build -DSD_ASSUME_DATADIR=1 -DCMAKE_INSTALL_PREFIX=/usr
|
||||
- name: Build project
|
||||
run: cmake --build build -j$(nproc --all)
|
||||
working-directory: /src
|
||||
|
|
|
@ -94,7 +94,6 @@ INCLUDE(cmake/checks.cmake)
|
|||
set(CMAKE_INSTALL_RPATH
|
||||
${CMAKE_INSTALL_RPATH}
|
||||
${CMAKE_INSTALL_PREFIX}/${SD_LIBDIR}/lib
|
||||
/usr/${SD_LIBDIR}/lib
|
||||
)
|
||||
|
||||
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||
|
|
Loading…
Reference in a new issue