]> SALOME platform Git repositories - tools/sat_salome.git/commitdiff
Salome HOME
spns #32926: Xdata compilation issue
authorNabil Ghodbane <nabil.ghodbane@cea.fr>
Tue, 31 Jan 2023 15:36:17 +0000 (16:36 +0100)
committerNabil Ghodbane <nabil.ghodbane@cea.fr>
Tue, 31 Jan 2023 15:36:17 +0000 (16:36 +0100)
products/patches/SPNS-32926-CONFIGURATION-V9_2_0.XDATA.patch

index 12e8b46a7a9513cef316e51aef7e5696e24fb26d..6b524f8761fca66fc32de004cbe43599f155635f 100644 (file)
@@ -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