From: vsr Date: Wed, 20 Mar 2019 05:51:55 +0000 (+0300) Subject: Integration of [CEA 13233] support new xdr.h location X-Git-Tag: V9_3_0b2~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f08413255fdde3538623a47ac608acb41451a589;p=tools%2Fconfiguration.git Integration of [CEA 13233] support new xdr.h location - Simpler solution, without hardcoding --- diff --git a/cmake/FindXDR.cmake b/cmake/FindXDR.cmake index 1febef1..d61ab2f 100644 --- a/cmake/FindXDR.cmake +++ b/cmake/FindXDR.cmake @@ -19,17 +19,9 @@ MESSAGE(STATUS "Check for XDR ...") -FIND_PATH(XDR_INCLUDE_DIRS rpc/xdr.h) +FIND_PATH(XDR_INCLUDE_DIRS rpc/xdr.h PATH_SUFFIXES tirpc) IF(XDR_INCLUDE_DIRS) SET(XDR_DEFINITIONS "-DHAS_XDR") -ELSE(XDR_INCLUDE_DIRS) - IF(EXISTS "/usr/include/tirpc/rpc/xdr.h") - MESSAGE(STATUS "XDR was found in /usr/include/tirpc ...") - include_directories(/usr/include/tirpc) - SET(XDR_DEFINITIONS "-DHAS_XDR") - SET(XDR_INCLUDE_DIRS "/usr/include/tirpc") - FIND_LIBRARY(XDR_LIBRARIES tirpc) - ENDIF() ENDIF(XDR_INCLUDE_DIRS) IF(WIN32)