← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to intern/cycles/util/CMakeLists.txt

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
intern/cycles/util/CMakeLists.txt
13
13
        util_cuda.cpp
14
14
        util_dynlib.cpp
15
15
        util_md5.cpp
16
 
        util_memarena.cpp
17
16
        util_opencl.cpp
18
17
        util_path.cpp
19
18
        util_string.cpp
23
22
        util_transform.cpp
24
23
)
25
24
 
26
 
if(WITH_CYCLES_TEST)
 
25
if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI)
27
26
        list(APPEND SRC
28
27
                util_view.cpp
29
28
        )
45
44
        util_map.h
46
45
        util_math.h
47
46
        util_md5.h
48
 
        util_memarena.h
49
47
        util_opencl.h
50
48
        util_opengl.h
51
49
        util_param.h