mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-22 06:59:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'hurd-rpath-origin'

Browse Source 
8d2f6f0971 hurd: Fix runtime path test
0c452257e7 hurd: Add relative rpath support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10078
This commit is contained in:
Brad King
2024-12-10 14:16:59 +00:00
committed by Kitware Robot
parent f0a79d35df 8d2f6f0971
commit 90e3d69551
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Modules/Platform/GNU.cmake
View File

@@ -4,6 +4,7 @@ set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
set(CMAKE_SHARED_LIBRARY_RPATH_ORIGIN_TOKEN "\$ORIGIN")
set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")

2
Tests/RunCMake/RuntimePath/RunCMakeTest.cmake
View File

@@ -45,7 +45,7 @@ block()
run_cmake(Stub)
set(RunCMake_TEST_NO_CLEAN 1)
run_cmake_command(Stub-build ${CMAKE_COMMAND} --build . --config Debug)
if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|SunOS)$|BSD")
if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|SunOS|GNU)$|BSD")
set(ldpath LD_LIBRARY_PATH)
elseif(CMAKE_SYSTEM_NAME MATCHES "^(Darwin)$")
set(ldpath DYLD_LIBRARY_PATH)