From 0d137225e98691aec313e3f454b50160005452f2 Mon Sep 17 00:00:00 2001 From: crouzet Date: Mon, 12 Sep 2022 14:48:06 +0200 Subject: [PATCH 1/1] =?utf8?q?sat=20#32160=20:=20integration=20patch=20nab?= =?utf8?q?il=20=20PythonTemplate=20-=20mise=20=C3=A0=20jour?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- data/templates/PythonComponent/CMakeLists.txt | 6 +----- data/templates/PythonComponent/resources/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/data/templates/PythonComponent/CMakeLists.txt b/data/templates/PythonComponent/CMakeLists.txt index 1911d00..8f592b9 100644 --- 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 6ae660c..85bd5ca 100644 --- 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}) -- 2.39.2