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