X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=adm_local%2Fcmake_files%2FUsePyQt4.cmake;h=bad5488ac6e6bb3845d6ff69abb992c96a8b300d;hb=3a0ba13afff7a465ade65e11e7b84f22a658bea4;hp=11d2d115020c543ca77ceb89f0ced901193f05f0;hpb=cac0b4571c951b557e1956d4777cf1e5199637c3;p=modules%2Fgui.git diff --git a/adm_local/cmake_files/UsePyQt4.cmake b/adm_local/cmake_files/UsePyQt4.cmake index 11d2d1150..bad5488ac 100644 --- a/adm_local/cmake_files/UsePyQt4.cmake +++ b/adm_local/cmake_files/UsePyQt4.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2014 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2015 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 @@ -80,7 +80,7 @@ MACRO(PYQT4_WRAP_UIC outfiles) _PYQT4_WRAP_GET_UNIQUE_TARGET_NAME(BUILD_UI_PY_FILES _uniqueTargetName) ADD_CUSTOM_TARGET(${_uniqueTargetName} ALL DEPENDS ${${outfiles}}) - ELSEIF(NOT WIN32) + ELSE(NOT WIN32) #### # ANA: Workaround for the Microsoft Visual Studio 2010. Seems there is a bug in # the Microsoft Visual Studio 2010 or CMake 2.8.10.2: custom target doesn't work @@ -98,7 +98,6 @@ MACRO(PYQT4_WRAP_UIC outfiles) SET(_output ${CMAKE_CURRENT_BINARY_DIR}/${_input_name}) _PYQT4_WRAP_GET_UNIQUE_TARGET_NAME(BUILD_UI_PY_FILES _TgName) ADD_CUSTOM_TARGET(${_TgName} ${PYQT_PYUIC_PATH} -o ${_output} ${CMAKE_CURRENT_SOURCE_DIR}/${_input} - COMMENT ANA:${_output} DEPENDS ${_input} ) SET_TARGET_PROPERTIES(${_TgName} PROPERTIES FOLDER PYQT4_WRAP_UIC_TARGETS)