Fix GUI compilation. Expand qobject.sip search path for DB11

diff --git a/applications/SALOME-9.8.0-native.pyconf b/applications/SALOME-9.8.0-native.pyconf
index 9facf2e81ed0780194a6c22076505f63d7b642bd..af8deee9138ef1184d09961fab0c71ce3085098b 100644 (file)
--- a/applications/SALOME-9.8.0-native.pyconf
+++ b/applications/SALOME-9.8.0-native.pyconf
@@ -247,3 +247,4 @@ __overwrite__ :
         'APPLICATION.products.statsmodels' : {tag:'0.6.1', base : 'no', section : 'version_0_6_1_no_pip'}
     }
 ]
+

diff --git a/products/CONFIGURATION.pyconf b/products/CONFIGURATION.pyconf
index 0a7a9b63d9a8e0ebc69b9ce14e1fe60e2c4d923b..ed3ec80716b7b5425c69a50608837dee364dc3f9 100755 (executable)
--- a/products/CONFIGURATION.pyconf
+++ b/products/CONFIGURATION.pyconf
@@ -26,5 +26,5 @@ default :
 
 default_DB11:
 {
-    patches : ['CONFIGURATION.SalomeMacros.cmake.DB11.patch']
+    patches : ['CONFIGURATION-DB11.patch']
 }

diff --git a/products/patches/CONFIGURATION-DB11.patch b/products/patches/CONFIGURATION-DB11.patch
new file mode 100644 (file)
index 0000000..74f02d4
--- /dev/null
+++ b/products/patches/CONFIGURATION-DB11.patch
@@ -0,0 +1,28 @@
+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 <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 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

diff --git a/products/patches/CONFIGURATION.SalomeMacros.cmake.DB11.patch b/products/patches/CONFIGURATION.SalomeMacros.cmake.DB11.patch
deleted file mode 100644 (file)
index 8c37ac2..0000000
--- a/products/patches/CONFIGURATION.SalomeMacros.cmake.DB11.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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