From 9df4b53da32005ddece27af6565876d9568f38c2 Mon Sep 17 00:00:00 2001 From: rnc Date: Mon, 2 Dec 2013 15:04:40 +0000 Subject: [PATCH] BUG: Build procedure: Fix from Renaud Barate for XDR detection issue on systems with newer CMake (2.8.11). The fix has been tested with CMake 2.8.10 too --- adm_local/cmake_files/FindSalomeXDR.cmake | 2 +- adm_local/cmake_files/FindXDR.cmake | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/adm_local/cmake_files/FindSalomeXDR.cmake b/adm_local/cmake_files/FindSalomeXDR.cmake index 2db53e88f..50fef653f 100644 --- 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 11a9cb7c9..8b39fda0f 100644 --- 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) -- 2.39.2