From 2fb992a96263351d0fbdff613772d100af6c994d Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Wed, 2 May 2018 10:57:16 -0500 Subject: [PATCH] Upstream the rest of our local FreeBSD patching FreeBSD/DragonflyBSD are also UNIX platforms, as far as trio is concerned, and we don't need to be setting the CMAKE_INSTALL_RPATH on FreeBSD. --- CMakeLists.txt | 4 +++- winpr/libwinpr/utils/trio/triodef.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b2947afce..d4f45d2a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -944,7 +944,9 @@ if (APPLE) set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks") else (APPLE) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - set(CMAKE_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..") + if (NOT FREEBSD) + set(CMAKE_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..") + endif() endif(APPLE) if (BUILD_SHARED_LIBS) diff --git a/winpr/libwinpr/utils/trio/triodef.h b/winpr/libwinpr/utils/trio/triodef.h index 9d5bf1015..723e3919b 100644 --- a/winpr/libwinpr/utils/trio/triodef.h +++ b/winpr/libwinpr/utils/trio/triodef.h @@ -88,7 +88,7 @@ # endif #endif -#if defined(__NetBSD__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) # define TRIO_PLATFORM_UNIX #endif