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.
This commit is contained in:
Kyle Evans
2018-05-02 10:57:16 -05:00
parent 2215071b23
commit 2fb992a962
2 changed files with 4 additions and 2 deletions

View File

@@ -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)

View File

@@ -88,7 +88,7 @@
# endif
#endif
#if defined(__NetBSD__)
#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
# define TRIO_PLATFORM_UNIX
#endif