Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit f5271de1 authored by saubatn's avatar saubatn
Browse files

UPDATED no qt?_wrapp_cpp CMake macro calls needed as we set AUTOMOC to ON

parent 10d580f9
......@@ -17,7 +17,7 @@ if(MML_GENERATE_GUI)
set(MML_GUI_MOC_SRCS SimulatorWidget.h
Xmlhighlighter.h
)
qt4_wrap_cpp(MML_GUI_MOCS ${MML_GUI_MOC_SRCS})
# qt4_wrap_cpp(MML_GUI_MOCS ${MML_GUI_MOC_SRCS}) Not needed if AUTOMOC is set to ON (CMake therefore handle moc automatically)
set(MML_GUI_HEADERS ${MML_GUI_MOC_SRCS})
set(MML_GUI_SRC ${MML_GUI_MOCS}
SimulatorWidget.cpp
......
......@@ -17,7 +17,7 @@ if (SOFA_SUPPORT)
set(SOFA_MOC_SRCS SofaWidget.h)
set(SOFA_UIS SofaWidget.ui)
qt4_wrap_ui(SOFA_UIS_H ${SOFA_UIS})
qt4_wrap_cpp(SOFA_MOCS ${SOFA_MOC_SRCS})
# qt4_wrap_cpp(SOFA_MOCS ${SOFA_MOC_SRCS}) Not needed if AUTOMOC is set to ON (CMake therefore handle moc automatically)
set(SOFA_GUI_SRC SofaWidget.cpp)
endif()
......
......@@ -9,7 +9,7 @@ set(monitoringgui_UIS
)
qt4_wrap_ui(monitoringgui_UIS_H ${monitoringgui_UIS})
qt4_wrap_cpp(monitoringgui_MOCS ${monitoringgui_MOC_SRCS})
# qt4_wrap_cpp(monitoringgui_MOCS ${monitoringgui_MOC_SRCS}) Not needed if AUTOMOC is set to ON (CMake therefore handle moc automatically)
qt4_add_resources(monitoringgui_QRC MonitoringGuiIcons.qrc)
......
......@@ -40,9 +40,6 @@ macro(gather_headers_and_sources Name)
set(MOC_SOURCES ${MOC_SOURCES} ${HEADER})
endif(stream MATCHES "Q_OBJECT")
endforeach(HEADER)
# manage Qt inherited sources
qt5_wrap_cpp(QT_SRCS ${MOC_SOURCES})
# On Windows, Visual Studio, organize files in subdirectories
if(MSVC)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment