From: rnv Date: Thu, 21 Dec 2017 12:33:14 +0000 (+0300) Subject: Merge changes from 'master' branch. X-Git-Tag: V9_0_0~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b83fb6d7abaf9107af18da173555c10bcd3f0163;p=tools%2Fconfiguration.git Merge changes from 'master' branch. --- b83fb6d7abaf9107af18da173555c10bcd3f0163 diff --cc cmake/UsePyQt.cmake index 7927ec1,42a5287..3d9ddca --- a/cmake/UsePyQt.cmake +++ b/cmake/UsePyQt.cmake @@@ -66,31 -65,18 +66,18 @@@ ENDFUNCTION( # #################################################################### MACRO(PYQT_WRAP_UIC outfiles) - SET(_output) - SET(_options) - SET(_pyuic_files) - SET(_get_options "0") - FOREACH(_input ${ARGN}) - IF(${_input} STREQUAL "OPTIONS") - SET(_get_options "1") - ELSE() - IF(${_get_options} STREQUAL "1") - SET(_options ${_options} ${_input}) - ELSE() - SET(_pyuic_files ${_pyuic_files} ${_input}) - ENDIF() - ENDIF() - ENDFOREACH() ++ SET(_output) - IF(NOT WIN32) - PARSE_ARGUMENTS(PYQT_WRAP_UIC "TARGET_NAME" "" ${ARGN}) ++ PARSE_ARGUMENTS(PYQT_WRAP_UIC "TARGET_NAME;OPTIONS" "" ${ARGN}) - FOREACH(_input ${_pyuic_files}) + IF(NOT WIN32) - + FOREACH(_input ${PYQT_WRAP_UIC_DEFAULT_ARGS}) GET_FILENAME_COMPONENT(_input_name ${_input} NAME) STRING(REPLACE ".ui" "_ui.py" _input_name ${_input_name}) SET(_output ${CMAKE_CURRENT_BINARY_DIR}/${_input_name}) ADD_CUSTOM_COMMAND( OUTPUT ${_output} - COMMAND ${PYQT_PYUIC_PATH} ${_options} -o ${_output} ${CMAKE_CURRENT_SOURCE_DIR}/${_input} - COMMAND ${PYQT_PYUIC_PATH} -o ${_output} ${CMAKE_CURRENT_SOURCE_DIR}/${_input} ++ COMMAND ${PYQT_PYUIC_PATH} ${PYQT_WRAP_UIC_OPTIONS} -o ${_output} ${CMAKE_CURRENT_SOURCE_DIR}/${_input} MAIN_DEPENDENCY ${_input} ) SET(${outfiles} ${${outfiles}} ${_output}) diff --cc config/salome.xml index 5ddbf9c,2d96166..06af4c8 --- a/config/salome.xml +++ b/config/salome.xml @@@ -69,11 -70,11 +71,11 @@@ - - + + - - + + @@@ -127,47 -135,44 +136,48 @@@ - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +