commentaire

[tools/eficas.git] / UiQT5 / CMakeLists.txt

diff --git a/UiQT5/CMakeLists.txt b/UiQT5/CMakeLists.txt
index 916356ed4f156fcf12bcf1348811a50d193eac6d..2adc29093e21ff128e9d55f794b8709a6dcdb147 100644 (file)
--- a/UiQT5/CMakeLists.txt
+++ b/UiQT5/CMakeLists.txt
@@ -24,7 +24,7 @@ macro ( eficas_compile_ui uifile )
   get_filename_component ( _file_we ${uifile} NAME_WE )
   set ( _pyfile "${_file_we}.py" )
   add_custom_command ( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_pyfile}
-                       COMMAND ${PYUIC4} ARGS -x -o ${CMAKE_CURRENT_BINARY_DIR}/${_pyfile} ${CMAKE_CURRENT_SOURCE_DIR}/${uifile}
+                       COMMAND ${PYUIC5} ARGS -x -o ${CMAKE_CURRENT_BINARY_DIR}/${_pyfile} ${CMAKE_CURRENT_SOURCE_DIR}/${uifile}
                        MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/${uifile}
                        COMMENT "Compiling ${uifile}"
                      )
@@ -36,7 +36,9 @@ eficas_compile_ui ( desBaseWidget.ui )
 eficas_compile_ui ( desChoixCata.ui )
 eficas_compile_ui ( desChoixCode.ui )
 eficas_compile_ui ( desChoixCommandes.ui )
+eficas_compile_ui ( desChoixLangue.ui )
 eficas_compile_ui ( desRecherche.ui )
+eficas_compile_ui ( desRechercheCatalogue.ui )
 eficas_compile_ui ( desSelectVal.ui )
 eficas_compile_ui ( desViewTexte.ui )
 eficas_compile_ui ( desViewRegles.ui )
@@ -45,6 +47,7 @@ eficas_compile_ui ( desWidgetCreeParam.ui )
 eficas_compile_ui ( desWidgetCommande.ui )
 eficas_compile_ui ( desWidgetFormule.ui )
 eficas_compile_ui ( desWidgetOptionnel.ui )
+eficas_compile_ui ( desGroupeOptionnel.ui )
 eficas_compile_ui ( Tuple2.ui )
 eficas_compile_ui ( Tuple3.ui )
 #
@@ -83,7 +86,7 @@ add_custom_target ( CompileUI ALL DEPENDS ${_PYFILES}
                   )
 
 install ( FILES ${_PYFILES}
-          DESTINATION ${CMAKE_INSTALL_PREFIX}/UiQT4
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/UiQT5
         )
 
 # Rules to compile TS files
@@ -97,11 +100,12 @@ FOREACH(input ${TSFILES})
   SET(QMFILES ${QMFILES} ${output})
   ADD_CUSTOM_COMMAND(OUTPUT ${output}
     COMMAND ${QT_LRELEASE_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${input} -qm ${output}
+    #    EXECUTE_PROCESS(COMMAND \${MYLRELEASE} \${MYTSFILE} -qm \${MYFULLDIR}/\${MYOUTQMFILE})
     MAIN_DEPENDENCY ${input})
 ENDFOREACH(input ${TSFILES})
 
 ADD_CUSTOM_TARGET(CompileTS ALL DEPENDS ${QMFILES})
-INSTALL(FILES ${QMFILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/UiQT4)
+INSTALL(FILES ${QMFILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/UiQT5)
 
 ### Local Variables:
 ### mode: cmake