From c4c04864b4968f2b84a9b69209006b1473003510 Mon Sep 17 00:00:00 2001 From: rnv Date: Mon, 22 Jun 2020 14:02:31 +0300 Subject: [PATCH] Build with native prerequsites --- cmake/FindSIP.cmake | 2 +- cmake/FindSalomeLibXml2.cmake | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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}) -- 2.39.2