← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/blender/blenkernel/CMakeLists.txt

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/blenkernel/CMakeLists.txt
25
25
 
26
26
set(INC
27
27
        .
28
 
        ../avi
29
28
        ../blenfont
30
29
        ../blenlib
31
30
        ../blenloader
43
42
        ../../../intern/memutil
44
43
        ../../../intern/mikktspace
45
44
        ../../../intern/opennl/extern
 
45
        ../../../intern/raskter
 
46
        ../../../intern/smoke/extern
46
47
 
47
48
        # XXX - BAD LEVEL CALL WM_api.h
48
49
        ../windowmanager
57
58
        intern/CCGSubSurf.c
58
59
        intern/DerivedMesh.c
59
60
        intern/action.c
 
61
        intern/addon.c
60
62
        intern/anim.c
61
63
        intern/anim_sys.c
62
64
        intern/armature.c
64
66
        intern/bmfont.c
65
67
        intern/boids.c
66
68
        intern/booleanops_mesh.c
 
69
        intern/bpath.c
67
70
        intern/brush.c
68
71
        intern/bullet.c
69
72
        intern/bvhutils.c
100
103
        intern/lamp.c
101
104
        intern/lattice.c
102
105
        intern/library.c
 
106
        intern/mask.c
 
107
        intern/mask_evaluate.c
 
108
        intern/mask_rasterize.c
103
109
        intern/material.c
104
110
        intern/mball.c
105
111
        intern/mesh.c
111
117
        intern/nla.c
112
118
        intern/node.c
113
119
        intern/object.c
 
120
        intern/object_deform.c
114
121
        intern/ocean.c
115
122
        intern/packedFile.c
116
123
        intern/paint.c
117
124
        intern/particle.c
118
125
        intern/particle_system.c
 
126
        intern/pbvh.c
 
127
        intern/pbvh_bmesh.c
119
128
        intern/pointcache.c
120
129
        intern/property.c
121
130
        intern/report.c
 
131
        intern/rigidbody.c
122
132
        intern/sca.c
123
133
        intern/scene.c
124
134
        intern/screen.c
125
135
        intern/script.c
126
136
        intern/seqcache.c
127
137
        intern/seqeffects.c
 
138
        intern/seqmodifier.c
128
139
        intern/sequencer.c
129
140
        intern/shrinkwrap.c
130
141
        intern/sketch.c
141
152
        intern/world.c
142
153
        intern/writeavi.c
143
154
        intern/writeframeserver.c
144
 
        
 
155
 
145
156
        BKE_DerivedMesh.h
146
157
        BKE_action.h
 
158
        BKE_addon.h
147
159
        BKE_anim.h
148
160
        BKE_animsys.h
149
161
        BKE_armature.h
153
165
        BKE_bmfont_types.h
154
166
        BKE_boids.h
155
167
        BKE_booleanops_mesh.h
 
168
        BKE_bpath.h
156
169
        BKE_brush.h
157
170
        BKE_bullet.h
158
171
        BKE_bvhutils.h
159
172
        BKE_camera.h
 
173
        BKE_ccg.h
160
174
        BKE_cdderivedmesh.h
161
175
        BKE_cloth.h
162
176
        BKE_collision.h
187
201
        BKE_lattice.h
188
202
        BKE_library.h
189
203
        BKE_main.h
 
204
        BKE_mask.h
190
205
        BKE_material.h
191
206
        BKE_mball.h
192
207
        BKE_mesh.h
196
211
        BKE_nla.h
197
212
        BKE_node.h
198
213
        BKE_object.h
 
214
        BKE_object_deform.h
199
215
        BKE_ocean.h
200
216
        BKE_packedFile.h
201
217
        BKE_paint.h
202
218
        BKE_particle.h
203
 
        BKE_plugin_types.h
 
219
        BKE_pbvh.h
204
220
        BKE_pointcache.h
205
221
        BKE_property.h
206
222
        BKE_report.h
 
223
        BKE_rigidbody.h
207
224
        BKE_sca.h
208
225
        BKE_scene.h
209
226
        BKE_screen.h
226
243
        BKE_world.h
227
244
        BKE_writeavi.h
228
245
        BKE_writeframeserver.h
 
246
 
229
247
        depsgraph_private.h
230
248
        nla_private.h
231
249
        intern/CCGSubSurf.h
 
250
        intern/pbvh_intern.h
232
251
)
233
252
 
234
253
add_definitions(-DGLEW_STATIC)
241
260
endif()
242
261
 
243
262
if(WITH_BULLET)
 
263
        list(APPEND INC_SYS
 
264
                ${BULLET_INCLUDE_DIRS}
 
265
        )
244
266
        list(APPEND INC
245
 
                ../../../extern/bullet2/src
 
267
                ../../../intern/rigidbody
246
268
        )
247
 
        add_definitions(-DUSE_BULLET)
 
269
        add_definitions(-DWITH_BULLET)
248
270
endif()
249
271
 
250
 
if(WITH_MOD_CLOTH_ELTOPO)
251
 
        list(APPEND INC
252
 
                ../../../extern/eltopo
253
 
        )
254
 
        add_definitions(-DWITH_ELTOPO)
255
 
endif()
 
272
#if(WITH_MOD_CLOTH_ELTOPO)
 
273
#       list(APPEND INC
 
274
#               ../../../extern/eltopo
 
275
#               ../../../extern/eltopo/eltopo3d
 
276
#       )
 
277
#       add_definitions(-DWITH_ELTOPO)
 
278
#endif()
256
279
 
257
280
if(WITH_IMAGE_OPENEXR)
258
281
        add_definitions(-DWITH_OPENEXR)
282
305
        add_definitions(-DWITH_HDR)
283
306
endif()
284
307
 
 
308
if(WITH_CODEC_AVI)
 
309
        list(APPEND INC
 
310
                ../avi
 
311
        )
 
312
        add_definitions(-DWITH_AVI)
 
313
endif()
 
314
 
285
315
if(WITH_CODEC_QUICKTIME)
286
316
        list(APPEND INC
287
317
                ../quicktime
314
344
        list(APPEND INC
315
345
                ../python
316
346
        )
317
 
        list(APPEND INC_SYS
318
 
                ${PYTHON_INCLUDE_DIRS}
319
 
        )
320
347
        add_definitions(-DWITH_PYTHON)
321
348
 
322
349
        if(WITH_PYTHON_SECURITY)
336
363
endif()
337
364
 
338
365
if(WITH_MOD_SMOKE)
339
 
        list(APPEND INC
340
 
                ../../../intern/smoke/extern
341
 
        )
342
366
        add_definitions(-DWITH_SMOKE)
343
367
endif()
344
368
 
346
370
        add_definitions(-DWITH_OCEANSIM)
347
371
endif()
348
372
 
349
 
if(WITH_MOD_DECIMATE)
350
 
        list(APPEND INC
351
 
                ../../../intern/decimation/extern
352
 
        )
353
 
endif()
354
 
 
355
373
if(WITH_MOD_BOOLEAN)
356
374
        list(APPEND INC
357
375
                ../../../intern/bsp/extern