Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CamiTK
CamiTK Community Edition
Commits
f5271de1
Commit
f5271de1
authored
Mar 14, 2016
by
saubatn
Browse files
UPDATED no qt?_wrapp_cpp CMake macro calls needed as we set AUTOMOC to ON
parent
10d580f9
Changes
4
Hide whitespace changes
Inline
Side-by-side
modeling/libraries/mml/monitoring/CMakeLists.txt
View file @
f5271de1
...
...
@@ -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
...
...
modeling/libraries/mml/monitoring/ExternalSimulatorSupport.cmake
View file @
f5271de1
...
...
@@ -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
()
...
...
modeling/libraries/mml/monitoringgui/CMakeLists.txt
View file @
f5271de1
...
...
@@ -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
)
...
...
sdk/cmake/modules/macros/GatherHeadersAndSources.cmake
View file @
f5271de1
...
...
@@ -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
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment