Merged changes in the trunk up to revision 54110.
[blender.git] / source / creator / CMakeLists.txt
index 2115b2a5ff66a6f2d6c43a56b035e3c28352d40b..4ac8364aa190b5eb2dd14b2e890a20df24d93154 100644 (file)
@@ -80,6 +80,11 @@ if(WITH_BINRELOC)
        blender_include_dirs(${BINRELOC_INCLUDE_DIRS})
 endif()
 
+if(WITH_FREESTYLE)
+       add_definitions(-DWITH_FREESTYLE)
+       blender_include_dirs(../blender/freestyle)
+endif()
+
 # Setup the exe sources and buildinfo
 set(SRC
        creator.c
@@ -279,15 +284,24 @@ if(WITH_PYTHON)
                set(ADDON_EXCLUDE_CONDITIONAL "_addons_contrib/*")  # dummy, wont do anything
        endif()
 
+       # do not install freestyle dir if disabled
+       if(NOT WITH_FREESTYLE)
+               set(FREESTYLE_EXCLUDE_CONDITIONAL "freestyle/*")
+       else()
+               set(FREESTYLE_EXCLUDE_CONDITIONAL "_freestyle/*")  # dummy, wont do anything
+       endif()
+
        install(
                DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts
                DESTINATION ${TARGETDIR_VER}
                PATTERN ".svn" EXCLUDE
                PATTERN "__pycache__" EXCLUDE
                PATTERN "${ADDON_EXCLUDE_CONDITIONAL}" EXCLUDE
+               PATTERN "${FREESTYLE_EXCLUDE_CONDITIONAL}" EXCLUDE
        )
        
        unset(ADDON_EXCLUDE_CONDITIONAL)
+       unset(FREESTYLE_EXCLUDE_CONDITIONAL)
 endif()
 
 # localization
@@ -852,6 +866,7 @@ endif()
                bf_python_ext
                bf_python_mathutils
                bf_python_bmesh
+               bf_freestyle
                bf_ikplugin
                bf_modifiers
                bf_bmesh