From: Renaud Barate Date: Tue, 29 Apr 2014 08:35:42 +0000 (+0200) Subject: Compatibility with CMake 2.8.12 X-Git-Tag: V7_4_0rc1~2^2~2^2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=87f1db9f4d7ed3979197e941b26a3b091356c447;p=tools%2Fmedcoupling.git Compatibility with CMake 2.8.12 --- diff --git a/src/MEDOP/gui/dialogs/CMakeLists.txt b/src/MEDOP/gui/dialogs/CMakeLists.txt index 43523210f..7b550727b 100644 --- a/src/MEDOP/gui/dialogs/CMakeLists.txt +++ b/src/MEDOP/gui/dialogs/CMakeLists.txt @@ -21,20 +21,6 @@ ADD_DEFINITIONS(${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${OMNIORB_DEFINITIONS}) INCLUDE(UseQt4Ext) -MACRO (QT4_WRAP_UI_XX outfiles ) - QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN}) - FOREACH (it ${ui_files}) - GET_FILENAME_COMPONENT(outfile ${it} NAME_WE) - GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE) - SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.hxx) - ADD_CUSTOM_COMMAND(OUTPUT ${outfile} - COMMAND ${QT_UIC_EXECUTABLE} - ARGS ${ui_options} -o ${outfile} ${infile} - MAIN_DEPENDENCY ${infile}) - SET(${outfiles} ${${outfiles}} ${outfile}) - ENDFOREACH (it) -ENDMACRO (QT4_WRAP_UI_XX) - SET(MEDOPGUI_dialogs_FORMS GenericDialog.ui DlgAlias.ui @@ -42,7 +28,7 @@ SET(MEDOPGUI_dialogs_FORMS DlgChangeUnderlyingMesh.ui DlgImageToMed.ui ) -QT4_WRAP_UI_XX(MEDOPGUI_dialogs_FORMS_HEADERS ${MEDOPGUI_dialogs_FORMS}) +QT4_WRAP_UI(MEDOPGUI_dialogs_FORMS_HEADERS ${MEDOPGUI_dialogs_FORMS}) SET(MEDOPGUI_dialogs_FILES GenericDialog.hxx