X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=adm_local%2Fcmake_files%2FUsePyQt.cmake;h=587aef25a6bb9d72a187ce0cbeccc431968a6c1b;hb=92e68f0cc04950e612551c2808c4472f7a3af216;hp=c9f747780f6a99a980ceb7ee7ff20979e42f5687;hpb=8d6a98a5c2f66655d1f4738afc7fffd914e59ad4;p=modules%2Fgui.git diff --git a/adm_local/cmake_files/UsePyQt.cmake b/adm_local/cmake_files/UsePyQt.cmake index c9f747780..587aef25a 100644 --- a/adm_local/cmake_files/UsePyQt.cmake +++ b/adm_local/cmake_files/UsePyQt.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -95,6 +95,7 @@ MACRO(PYQT_WRAP_UIC outfiles) SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON) _PYQT_WRAP_GET_UNIQUE_TARGET_NAME(BUILD_UI_PY_FILES _uniqueTargetName) ADD_CUSTOM_TARGET(${_uniqueTargetName} ALL) + SET_TARGET_PROPERTIES(${_uniqueTargetName} PROPERTIES FOLDER PYQT_WRAP_UIC_TARGETS) FOREACH(_input ${ARGN}) GET_FILENAME_COMPONENT(_input_name ${_input} NAME) STRING(REPLACE ".ui" "_ui.py" _input_name ${_input_name}) @@ -104,7 +105,7 @@ MACRO(PYQT_WRAP_UIC outfiles) DEPENDS ${_input} ) SET_TARGET_PROPERTIES(${_TgName} PROPERTIES FOLDER PYQT_WRAP_UIC_TARGETS) - ADD_DEPENDENCIES(${_uniqueTargetName} DEPEND ${_TgName}) + ADD_DEPENDENCIES(${_uniqueTargetName} ${_TgName}) SET(${outfiles} ${${outfiles}} ${_output}) ENDFOREACH() ENDIF(NOT WIN32)