BUG: Build procedure: Fix from Renaud Barate for XDR detection issue on systems with...

diff --git a/adm_local/cmake_files/FindSalomeXDR.cmake b/adm_local/cmake_files/FindSalomeXDR.cmake
index 2db53e88f43075e51fe8d8e12cc34c165ded63c1..50fef653f13514f724be1f70d0623f183a4d57a2 100644 (file)
--- a/adm_local/cmake_files/FindSalomeXDR.cmake
+++ b/adm_local/cmake_files/FindSalomeXDR.cmake
@@ -24,7 +24,7 @@
 #  !! Please read the generic detection procedure in SalomeMacros.cmake !!
 #
 
-SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(XDR XDR_FOUND 1)
+SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(XDR XDR_INCLUDE_DIRS 1)
 #MARK_AS_ADVANCED()
 
 #IF(XDR_FOUND) # useless here because XDR is used only in CXX of MEDLoader

diff --git a/adm_local/cmake_files/FindXDR.cmake b/adm_local/cmake_files/FindXDR.cmake
index 11a9cb7c9a2b00d12657498bb5ed4dde17981f80..8b39fda0fc88c55625efd651101f15409a161a79 100644 (file)
--- a/adm_local/cmake_files/FindXDR.cmake
+++ b/adm_local/cmake_files/FindXDR.cmake
@@ -27,11 +27,10 @@ ENDIF(XDR_ROOT_DIR)
 FIND_LIBRARY(XDR_LIBRARIES xdr)
 FIND_PATH(XDR_INCLUDE_DIRS rpc/xdr.h)
 SET(XDR_DEFINITIONS "-DHAS_XDR")
-SET(XDR_FOUND 1)
 
 IF(WIN32)
   LIST(APPEND XDR_INCLUDE_DIRS "${XDR_ROOT_DIR}/include/src/msvc")
 ENDIF(WIN32)
 
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(XDR REQUIRED_VARS XDR_FOUND)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(XDR REQUIRED_VARS XDR_INCLUDE_DIRS)