From: Nabil Ghodbane Date: Tue, 31 Jan 2023 15:36:17 +0000 (+0100) Subject: spns #32926: Xdata compilation issue X-Git-Tag: V9_11_0~116 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8aa42ce1ed2128f43d4591d9f7ec39b19f8f9f58;p=tools%2Fsat_salome.git spns #32926: Xdata compilation issue --- diff --git a/products/patches/SPNS-32926-CONFIGURATION-V9_2_0.XDATA.patch b/products/patches/SPNS-32926-CONFIGURATION-V9_2_0.XDATA.patch index 12e8b46..6b524f8 100644 --- a/products/patches/SPNS-32926-CONFIGURATION-V9_2_0.XDATA.patch +++ b/products/patches/SPNS-32926-CONFIGURATION-V9_2_0.XDATA.patch @@ -1,31 +1,3 @@ -diff --git a/cmake/FindXDR.cmake b/cmake/FindXDR.cmake -index e8e8625..52f2de9 100644 ---- a/cmake/FindXDR.cmake -+++ b/cmake/FindXDR.cmake -@@ -19,7 +19,7 @@ - - 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") - ENDIF() -@@ -34,6 +34,14 @@ IF(WIN32) - SET(XDR_INCLUDE_DIRS "${XDR_INCLUDE_DIRS2}") # Make the detection fail - ENDIF() - ENDIF() -+ELSE(WIN32) -+ FIND_LIBRARY(XDR_LIBRARIES NAMES tirpc xdr) -+ IF(NOT XDR_LIBRARIES) -+ MESSAGE(STATUS "Could not find XDR libraries ...") -+ SET(XDR_LIBRARIES) # reset variable tough -+ ELSE() -+ MESSAGE(STATUS "Found XDR libraries ${XDR_LIBRARIES} ...") -+ ENDIF() - ENDIF(WIN32) - - INCLUDE(FindPackageHandleStandardArgs) diff --git a/cmake/SalomeMacros.cmake b/cmake/SalomeMacros.cmake index bc7baaa..6fa6fe0 100755 --- a/cmake/SalomeMacros.cmake