← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to source/blender/makesrna/intern/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:
source/blender/makesrna/intern/CMakeLists.txt
23
23
#
24
24
# ***** END GPL LICENSE BLOCK *****
25
25
 
26
 
# Generated code has some unused vars we can ignore.
27
 
remove_strict_flags()
28
 
 
29
26
if(CMAKE_COMPILER_IS_GNUCC)
30
27
        # add here so we fail early.
31
28
        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration")
124
121
)
125
122
 
126
123
string(REGEX REPLACE "rna_([a-zA-Z0-9_-]*).c" "${CMAKE_CURRENT_BINARY_DIR}/rna_\\1_gen.c" GENSRC "${DEFSRC}")
127
 
set_source_files_properties(GENSRC PROPERTIES GENERATED true)
 
124
set_source_files_properties(${GENSRC} PROPERTIES GENERATED TRUE)
128
125
 
129
126
set(SRC_RNA_INC
130
127
        ../RNA_access.h
276
273
        ../../../../intern/audaspace/intern
277
274
        ../../../../intern/cycles/blender
278
275
        ../../../../intern/guardedalloc
 
276
        ../../../../intern/atomic
279
277
        ../../../../intern/memutil
280
278
        ../../../../intern/smoke/extern
281
279
)
282
280
 
283
 
if(WITH_FREESTYLE)
284
 
        # TO BE REMOVED when the trunk merger is done
285
 
        add_definitions(-DWITH_FREESTYLE)
286
 
endif()
287
 
 
288
281
blender_include_dirs_sys(
289
282
        ${GLEW_INCLUDE_PATH}
290
283
)