From 1f0d893e5aa33bd6fec3e9241a61e9e4206b87ae Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Fri, 19 Apr 2019 12:16:07 +0200 Subject: [PATCH] enable os x rpath usage in cmake --- CMakeLists.txt | 2 ++ ext/CMakeLists.txt | 1 - src/CMakeLists.txt | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e331318c..b39fd991 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,6 +126,8 @@ SET (ENABLE_HAIKU ON) SET (have_system ${have_system}x) ENDIF (HAIKU) +SET (CMAKE_MACOSX_RPATH ON) + IF (${have_system} STREQUAL x) MESSAGE (STATUS "Building for no system") ENDIF (${have_system} STREQUAL x) diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt index 7c25535a..f01c0238 100644 --- a/ext/CMakeLists.txt +++ b/ext/CMakeLists.txt @@ -163,7 +163,6 @@ ENDIF () SET_TARGET_PROPERTIES(libsolvext PROPERTIES OUTPUT_NAME "solvext") SET_TARGET_PROPERTIES(libsolvext PROPERTIES SOVERSION ${LIBSOLVEXT_SOVERSION}) -SET_TARGET_PROPERTIES(libsolvext PROPERTIES INSTALL_NAME_DIR ${CMAKE_INSTALL_LIBDIR}) INSTALL (FILES ${libsolvext_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/solv") INSTALL (TARGETS libsolvext LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f91c9c0a..6abb3adb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -55,7 +55,6 @@ ENDIF (DISABLE_SHARED) SET_TARGET_PROPERTIES(libsolv PROPERTIES OUTPUT_NAME "solv") SET_TARGET_PROPERTIES(libsolv PROPERTIES SOVERSION ${LIBSOLV_SOVERSION}) -SET_TARGET_PROPERTIES(libsolv PROPERTIES INSTALL_NAME_DIR ${CMAKE_INSTALL_LIBDIR}) INSTALL (FILES ${libsolv_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/solv") INSTALL (TARGETS libsolv LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -- 2.47.2