From: vsr Date: Wed, 5 Jan 2022 13:57:14 +0000 (+0300) Subject: bos #26882 [CEA 26832] CONFIGURATION Debian 11 X-Git-Tag: EMC2P_V_1_3_5-rc1~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=07803c91d11d42ed3e67f96b1f7a43bbb4b9460d;p=tools%2Fconfiguration.git bos #26882 [CEA 26832] CONFIGURATION Debian 11 --- diff --git a/cmake/FindPyQt5.cmake b/cmake/FindPyQt5.cmake index 35efa02..7d66202 100644 --- 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 /sip/QtCore, for a custom install # - or /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 805d05b..ed1ca49 100644 --- 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