From 71c284f60c6475ff350eb15f1052ef6c4573c97c Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 2 Mar 2010 12:45:28 +0000 Subject: [PATCH] Fix boost and libxml2 check procedures for PARAVIS compilation --- salome_adm/cmake_files/FindBOOST.cmake | 3 +++ salome_adm/cmake_files/FindLIBXML2.cmake | 3 +++ 2 files changed, 6 insertions(+) diff --git a/salome_adm/cmake_files/FindBOOST.cmake b/salome_adm/cmake_files/FindBOOST.cmake index 65600aa39..5441126ba 100644 --- a/salome_adm/cmake_files/FindBOOST.cmake +++ b/salome_adm/cmake_files/FindBOOST.cmake @@ -53,6 +53,9 @@ IF(BOOST_STATUS) SET(BOOST_ROOT_USER ${WITH_BOOST}) ELSE(WITH_BOOST) SET(BOOST_ROOT_USER $ENV{BOOST_ROOT}) + IF(NOT BOOST_ROOT_USER) + SET(BOOST_ROOT_USER $ENV{BOOSTDIR}) + ENDIF(NOT BOOST_ROOT_USER) ENDIF(WITH_BOOST) ENDIF(BOOST_STATUS) diff --git a/salome_adm/cmake_files/FindLIBXML2.cmake b/salome_adm/cmake_files/FindLIBXML2.cmake index 7d87abcc4..7aadd9929 100644 --- a/salome_adm/cmake_files/FindLIBXML2.cmake +++ b/salome_adm/cmake_files/FindLIBXML2.cmake @@ -53,6 +53,9 @@ IF(LIBXML2_STATUS) SET(LIBXML2_ROOT_USER ${WITH_LIBXML2}) ELSE(WITH_LIBXML2) SET(LIBXML2_ROOT_USER $ENV{LIBXML2_ROOT}) + IF(NOT LIBXML2_ROOT_USER) + SET(LIBXML2_ROOT_USER $ENV{LIBXML_DIR}) + ENDIF(NOT LIBXML2_ROOT_USER) ENDIF(WITH_LIBXML2) ENDIF(LIBXML2_STATUS) -- 2.39.2