From: rnv <rnv@opencascade.com>
Date: Mon, 22 Jun 2020 11:02:31 +0000 (+0300)
Subject: Build with native prerequsites
X-Git-Tag: V9_6_0a1~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3e656f982087f580bab8bf734625dca07ff02180;hp=9a5afb20ec3d7db9252f814c4e058dcbc9cdc346;p=tools%2Fconfiguration.git

Build with native prerequsites
---

diff --git a/cmake/FindSIP.cmake b/cmake/FindSIP.cmake
index 801988f..2a2a5d5 100644
--- a/cmake/FindSIP.cmake
+++ b/cmake/FindSIP.cmake
@@ -32,7 +32,7 @@ IF(NOT SIP_FIND_QUIETLY)
 ENDIF()
 
 FIND_PROGRAM(SIP_EXECUTABLE sip)
-FIND_PATH(SIP_INCLUDE_DIR sip.h PATH_SUFFIXES python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+FIND_PATH(SIP_INCLUDE_DIR sip.h PATH_SUFFIXES python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}m)
 
 IF(SIP_INCLUDE_DIR)
   GET_FILENAME_COMPONENT(SIP_PYTHONPATH "${SIP_INCLUDE_DIR}" PATH)
diff --git a/cmake/FindSalomeLibXml2.cmake b/cmake/FindSalomeLibXml2.cmake
index 16c1a76..03231e4 100644
--- a/cmake/FindSalomeLibXml2.cmake
+++ b/cmake/FindSalomeLibXml2.cmake
@@ -28,6 +28,10 @@ ELSE()
 ENDIF()
 #MARK_AS_ADVANCED()
 
+IF(NOT LIBXML2_INCLUDE_DIR)
+  SET(LIBXML2_INCLUDE_DIR ${LIBXML2_INCLUDE_DIRS})
+ENDIF()
+
 IF(LIBXML2_FOUND) 
   SALOME_ACCUMULATE_HEADERS(LIBXML2_INCLUDE_DIR)
   SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${LIBXML2_LIBRARIES})