]> SALOME platform Git repositories - tools/configuration.git/commitdiff
Salome HOME
Build with native prerequsites
authorrnv <rnv@opencascade.com>
Mon, 22 Jun 2020 11:02:31 +0000 (14:02 +0300)
committervsr <vsr@opencascade.com>
Wed, 29 Jul 2020 12:47:08 +0000 (15:47 +0300)
cmake/FindSIP.cmake
cmake/FindSalomeLibXml2.cmake

index 801988f1e3a8076a5d5790c9f6acdc9bc7d18eab..2a2a5d588fafdfb06bbd024c2416247c1ccf1da5 100644 (file)
@@ -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)
index 16c1a76fff97e38ece8be9a69f11fd20c38a3a2b..03231e4616c1417210c1bfc164e06f9838a8cc12 100644 (file)
@@ -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})