Cycles: svn merge -r37904:37957 https://svn.blender.org/svnroot/bf-blender/trunk...
[blender-staging.git] / CMakeLists.txt
index 24a6f263b426acb5f073287967143828e17d35bd..8c865b701d8534e644c891f8da9bfe14899fcd73 100644 (file)
@@ -83,6 +83,7 @@ enable_testing()
 
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE )
 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE )
+set(INCLUDE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/include CACHE INTERNAL "" FORCE )
 
 #-----------------------------------------------------------------------------
 # Set default config options
@@ -170,6 +171,10 @@ if(UNIX AND NOT APPLE)
        option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
 endif()
 option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
+option(WITH_API_INSTALL     "Copy API header files into the blender install folder" ON)
+
+# Cycles
+option(WITH_CYCLES                     "Enable Cycles Render Engine" ON)
 
 # disable for now, but plan to support on all platforms eventually
 option(WITH_MEM_JEMALLOC   "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
@@ -1215,13 +1220,19 @@ add_subdirectory(extern)
 # Blender Application
 add_subdirectory(source/creator)
 
-
 #-----------------------------------------------------------------------------
 # Blender Player
 if(WITH_PLAYER)
        add_subdirectory(source/blenderplayer)
 endif()
 
+#-----------------------------------------------------------------------------
+# Cycles
+
+if(WITH_CYCLES)
+       add_subdirectory(intern/cycles)
+endif()
+
 #-----------------------------------------------------------------------------
 # CPack for generating packages
 include(build_files/cmake/packaging.cmake)