Merged changes in the trunk up to revision 49986.
[blender.git] / source / blender / CMakeLists.txt
index 92785804b0188b4503878d20014b9da615f12160..611a920b7f1032f1c60c09e084f0a8512bede6f4 100644 (file)
@@ -51,6 +51,7 @@ set(SRC_DNA_INC
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_key_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lamp_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lattice_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_key_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lamp_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lattice_types.h
+       ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_linestyle_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_listBase.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_material_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mesh_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_listBase.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_material_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mesh_types.h
@@ -106,6 +107,7 @@ add_subdirectory(nodes)
 add_subdirectory(modifiers)
 add_subdirectory(makesdna)
 add_subdirectory(makesrna)
 add_subdirectory(modifiers)
 add_subdirectory(makesdna)
 add_subdirectory(makesrna)
+ADD_SUBDIRECTORY(freestyle)
 
 if(WITH_COMPOSITOR)
        add_subdirectory(opencl)  # later on this may be used more generally
 
 if(WITH_COMPOSITOR)
        add_subdirectory(opencl)  # later on this may be used more generally