Merge lp:~johannr/meshbuilder/cmake into lp:meshbuilder

Proposed by Johannes Ring
Status: Merged
Merged at revision: 156
Proposed branch: lp:~johannr/meshbuilder/cmake
Merge into: lp:meshbuilder
Diff against target: 49 lines (+0/-16)
1 file modified
src/CMakeLists.txt (+0/-16)
To merge this branch: bzr merge lp:~johannr/meshbuilder/cmake
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+62754@code.launchpad.net

Description of the change

Remove build warnings by not moccing files which shouldn't be mocced.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/CMakeLists.txt'
2--- src/CMakeLists.txt 2011-05-23 13:22:37 +0000
3+++ src/CMakeLists.txt 2011-05-28 06:26:28 +0000
4@@ -59,20 +59,12 @@
5
6 # files which need to be moc'd by Qt
7 set(MESHBUILDER_MOC_SRCS
8- #base/ObjectState.h
9-
10- #util/QtUtil.h
11 util/SimResState.h
12
13 osgQt/AdapterWidget.h
14- #osgQt/TrackballManipulator.h
15 osgQt/RenderArea.h
16
17- #scenegraph/OsgTransformObject.h
18- #scenegraph/OsgDrawableObject.h
19 scenegraph/OsgDrawableObjectConnector.h
20- #scenegraph/OsgMeshObject.h
21- #scenegraph/OsgDolfinObject.h
22
23 gui/ColorButton.h
24 gui/FloatSlider.h
25@@ -81,15 +73,9 @@
26 gui/MaterialSettings.h
27 gui/TransformSettings.h
28 gui/SimResSettings.h
29- #gui/DolfinEventHandler.h
30 gui/Viewer.h
31 gui/ApplicationWindow.h
32 gui/Viewer_2D.h
33- gui/Scene_2D.h
34- gui/EntityInterface_2D.h
35- #gui/Vertex_2D.h
36- #gui/Edge_2D.h
37- gui/Axes_2D.h
38 gui/VisualizationDialog_2D.h
39 gui/ViewerSettingsDialog.h
40 gui/ClipPlanesDialog.h
41@@ -97,8 +83,6 @@
42 gui/VisualizationDialog.h
43 gui/DrawSettingsDialog.h
44 gui/MeshFunctionsToolbar.h
45- gui/ViewerInterface.h
46- gui/DolfinObject.h
47 )
48
49 # ui files

Subscribers

People subscribed via source and target branches