Merge branch 'V7_dev' of https://git.salome-platform.org/git/modules/kernel into...

diff --git a/bin/salomeContext.py b/bin/salomeContext.py
index 68c5bb46de096872d165a3aa2a87376ae64c9751..68d018ca37a8eb9973e77f60e0b58b38044ec0d9 100644 (file)
--- a/bin/salomeContext.py
+++ b/bin/salomeContext.py
@@ -85,6 +85,7 @@ class SalomeContext:
   to .cfg format before setting the context.
   """
   def __init__(self, configFileNames=0):
+    self.getLogger().setLevel(logging.INFO)
     #it could be None explicitely (if user use multiples setVariable...for standalone)
     if configFileNames is None:
        return

diff --git a/salome_adm/cmake_files/FindSalomePythonLibs.cmake b/salome_adm/cmake_files/FindSalomePythonLibs.cmake
index 06e87aae5a94304f5393bae0cb9ab604c95618c6..2228abb1d0f501796fff4ac87abbe3c42d8d66f1 100644 (file)
--- a/salome_adm/cmake_files/FindSalomePythonLibs.cmake
+++ b/salome_adm/cmake_files/FindSalomePythonLibs.cmake
@@ -34,6 +34,7 @@ ENDIF()
 IF (SALOMEPYTHONINTERP_FOUND AND NOT "${PYTHON_VERSION_STRING}" STREQUAL "") 
    # Trying to search libraries with same version as an interpreter version
    SET(PythonLibs_FIND_VERSION ${PYTHON_VERSION_STRING})
+   SET(PythonLibs_FIND_VERSION_MAJOR ${PYTHON_VERSION_MAJOR})
 ENDIF()
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(PythonLibs PYTHON_INCLUDE_DIR 2)