sat #32160 : integration patch nabil PythonTemplate - mise à jour

diff --git a/data/templates/PythonComponent/CMakeLists.txt b/data/templates/PythonComponent/CMakeLists.txt
index 1911d0036a144b5d02fe52dc4362861cc277f2ca..8f592b9e541cdefee3a41e55bd0f5684608070b2 100644 (file)
--- a/data/templates/PythonComponent/CMakeLists.txt
+++ b/data/templates/PythonComponent/CMakeLists.txt
@@ -99,11 +99,7 @@ ENDIF(EXISTS ${GUI_ROOT_DIR})
 ## From GUI:
 ##
 # Qt
-IF(NOT SALOME_GUI_BUILD_WITH_QT5)
-  FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
-ELSE()
-  FIND_PACKAGE(SalomeQt5 REQUIRED)
-ENDIF()
+FIND_PACKAGE(SalomeQt5 REQUIRED)
 
 # Detection summary:
 SALOME_PACKAGE_REPORT_AND_CHECK()

diff --git a/data/templates/PythonComponent/resources/CMakeLists.txt b/data/templates/PythonComponent/resources/CMakeLists.txt
index 6ae660cd29f3a5049a4fd3308dc2a75be629c572..85bd5cadde0cd101408ccc2174d5a1d1318ece18 100644 (file)
--- a/data/templates/PythonComponent/resources/CMakeLists.txt
+++ b/data/templates/PythonComponent/resources/CMakeLists.txt
@@ -29,3 +29,4 @@ SET(Others_RESOURCES
 )
 
 INSTALL(FILES ${Others_RESOURCES} DESTINATION ${SALOME_:sat:{PYCMP}_INSTALL_RES_DATA})
+INSTALL(FILES SalomeApp.xml RENAME SalomeAppSL.xml DESTINATION ${SALOME_:sat:{PYCMP}_INSTALL_RES_DATA})