Skip to content

Commit

Permalink
Replace CMake LIBDIR paths to use FULL_LIBDIR
Browse files Browse the repository at this point in the history
  • Loading branch information
fqidz authored and lbartoletti committed Oct 18, 2024
1 parent 809a4a3 commit 1f78f01
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
endif()

SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
#SET(CMAKE_MACOSX_RPATH ON)

Expand Down
2 changes: 1 addition & 1 deletion sfcgal-config.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
prefix=@CMAKE_INSTALL_PREFIX@
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
libdir=@CMAKE_INSTALL_FULL_LIBDIR@

usage()
{
Expand Down
2 changes: 1 addition & 1 deletion sfcgal.pc.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
includedir=${prefix}/include

Name: sfcgal
Expand Down

0 comments on commit 1f78f01

Please sign in to comment.