]> SALOME platform Git repositories - tools/configuration.git/commitdiff
Salome HOME
Integration of [CEA 13233] support new xdr.h location
authorvsr <vsr@opencascade.com>
Wed, 20 Mar 2019 05:51:55 +0000 (08:51 +0300)
committervsr <vsr@opencascade.com>
Wed, 20 Mar 2019 05:51:55 +0000 (08:51 +0300)
- Simpler solution, without hardcoding

cmake/FindXDR.cmake

index 1febef1deb492a283754cd2678b19fde13534c02..d61ab2f0235fcaf83c321c2b75225c0a531d70b4 100644 (file)
 
 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)