mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4617 from kevans91/spurious

Browse Source 
Upstream the rest of our local FreeBSD patching
This commit is contained in:
akallabeth 2018-05-03 11:55:03 +02:00 committed by GitHub
commit dd577377dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -945,7 +945,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)

2
winpr/libwinpr/utils/trio/triodef.h
View File

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