Blob Blame History Raw
diff -up ./cmake/internal/SearchForStuff.cmake.tirpc ./cmake/internal/SearchForStuff.cmake
--- ./cmake/internal/SearchForStuff.cmake.tirpc	2018-02-24 15:17:04.429808277 -0500
+++ ./cmake/internal/SearchForStuff.cmake	2018-02-24 15:24:27.775383956 -0500
@@ -4,6 +4,7 @@ INCLUDE (CheckFunctionExists)
 INCLUDE (CheckIncludeFiles)
 INCLUDE (CheckLibraryExists)
 INCLUDE (CheckSymbolExists)
+INCLUDE (FindPkgConfig)
 
 SET (PLAYER_EXTRA_LIB_DIRS "" CACHE STRING "List of extra library directories.")
 MARK_AS_ADVANCED (PLAYER_EXTRA_LIB_DIRS)
@@ -19,10 +20,19 @@ ENDIF (PLAYER_OS_QNX)
 CHECK_FUNCTION_EXISTS (getaddrinfo HAVE_GETADDRINFO)
 SET (CMAKE_REQUIRED_LIBRARIES)
 
+IF (PLAYER_OS_LINUX AND PKG_CONFIG_FOUND)
+    PKG_CHECK_MODULES(TIRPC libtirpc)
+    IF (TIRPC_FOUND)
+    ENDIF(TIRPC_FOUND)
+ENDIF(PLAYER_OS_LINUX AND PKG_CONFIG_FOUND)
+
+
 IF (PLAYER_OS_QNX)
     SET (CMAKE_REQUIRED_LIBRARIES rpc)
 ELSEIF (PLAYER_OS_SOLARIS)
     SET (CMAKE_REQUIRED_LIBRARIES nsl)
+  ELSEIF (PLAYER_OS_LINUX AND TIRPC_FOUND)
+    SET (CMAKE_REQUIRED_LIBRARIES tirpc)
 ENDIF (PLAYER_OS_QNX)
 CHECK_FUNCTION_EXISTS (xdr_free HAVE_XDR)
 IF (HAVE_XDR)
@@ -141,7 +151,6 @@ INCLUDE (TestBigEndian)
 TEST_BIG_ENDIAN (WORDS_BIGENDIAN)
 
 # GTK checks
-INCLUDE (FindPkgConfig)
 IF (NOT PKG_CONFIG_FOUND)
     MESSAGE (STATUS "WARNING: Could not find pkg-config. This will prevent searching for GTK and building many drivers.")
 ELSE (NOT PKG_CONFIG_FOUND)
diff -up ./libplayerinterface/CMakeLists.txt.tirpc ./libplayerinterface/CMakeLists.txt
--- ./libplayerinterface/CMakeLists.txt.tirpc	2018-02-24 15:25:40.324641800 -0500
+++ ./libplayerinterface/CMakeLists.txt	2018-02-24 15:46:49.665618088 -0500
@@ -95,6 +95,10 @@
 
 IF (PLAYER_OS_QNX)
     SET (interfaceLibFlag -lrpc)
+ELSEIF (PLAYER_OS_LINUX AND TIRPC_FOUND)
+    SET (interfaceLibFlag -ltirpc)
+    set (interfaceCflags ${TIRPC_CFLAGS})
+    INCLUDE_DIRECTORIES(${TIRPC_INCLUDE_DIRS})
 ELSE (PLAYER_OS_QNX)
     SET (interfaceLibFlag)
 ENDIF (PLAYER_OS_QNX)
@@ -110,12 +114,16 @@
 IF (PLAYER_OS_QNX)
     TARGET_LINK_LIBRARIES (playerinterface rpc)
     PLAYERCORE_ADD_INT_LINK_LIB (rpc)
+ELSEIF (PLAYER_OS_LINUX)
+    TARGET_LINK_LIBRARIES (playerinterface ${TIRPC_LIBRARIES})
+    PLAYERCORE_ADD_INT_LINK_LIB (tirpc)
+    TARGET_INCLUDE_DIRECTORIES (playerinterface PUBLIC ${TIRPC_INCLUDE_DIRS})
 ENDIF (PLAYER_OS_QNX)
 IF (NOT HAVE_XDR)
     TARGET_LINK_LIBRARIES (playerinterface playerreplace)
 ENDIF (NOT HAVE_XDR)
 PLAYER_MAKE_PKGCONFIG ("playerinterface" "Player Interface library - part of the Player Project"
-                       "" "" "" "${interfaceLibFlag}")
+                       "" "" "${interfaceCflags}" "${interfaceLibFlag}")
 
 PLAYER_INSTALL_HEADERS (playerinterface ${playerxdr_h}
                                         addr_util.h