bos #26882 [CEA 26832] CONFIGURATION Debian 11

diff --git a/cmake/FindPyQt5.cmake b/cmake/FindPyQt5.cmake
index 35efa028bd6668d5a636db276529889f2ca4e4fa..7d66202a7cff580a675528de27d118b331872da9 100644 (file)
--- a/cmake/FindPyQt5.cmake
+++ b/cmake/FindPyQt5.cmake
@@ -56,7 +56,7 @@ GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${_tmp_ROOT_DIR}" PATH)
 #   - /usr/share/sip/PyQt5/QtCore, for a system install
 #   - or <xyz>/sip/QtCore, for a custom install
 #   - or <xyz>/share/sip/QtCore, for a custom install
-FIND_FILE(PYQT_SIP_MAIN_FILE qobject.sip PATH_SUFFIXES share/sip/QtCore sip/QtCore share/sip/PyQt5/QtCore)
+FIND_FILE(PYQT_SIP_MAIN_FILE qobject.sip PATH_SUFFIXES share/sip/QtCore sip/QtCore share/sip/PyQt5/QtCore lib/python3/dist-packages/PyQt5/bindings/QtCore)
 
 IF(PYQT_SIP_MAIN_FILE)
   GET_FILENAME_COMPONENT(PYQT_SIPS_DIR "${PYQT_SIP_MAIN_FILE}" PATH)

diff --git a/cmake/SalomeMacros.cmake b/cmake/SalomeMacros.cmake
index 805d05b90ae25615eeddfee72d01bb3654bb8c14..ed1ca49de9196a46bf4a3c6c4ec7eba6a88088e5 100644 (file)
--- a/cmake/SalomeMacros.cmake
+++ b/cmake/SalomeMacros.cmake
@@ -30,7 +30,9 @@ CMAKE_POLICY(SET CMP0053 NEW)   # For correct Qt 5 detection procedure
 IF(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
   CMAKE_POLICY(SET CMP0074 NEW) # Use ROOT variables when detecting packages
 ENDIF()
-
+IF(CMAKE_VERSION VERSION_GREATER_EQUAL 3.18)
+  CMAKE_POLICY(SET CMP0057 NEW)
+ENDIF()
 #----------------------------------------------------------------------------
 # LIST_CONTAINS is a macro useful for determining whether a list has a 
 # particular entry