Cycles:

* add some (disabled) test code for using OpenImageIO in imbuf
* link cycles, openimageio and boost into blender instead of a shared library
* some cmakefile changes to simplify the code and follow conventions better
* this may solve running cycles problems on windows XP, or give a different
  and hopefully more useful error message

17 files changed, 310 insertions, 465 deletions

diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index 413952e8791..77ae0486d16 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -1,81 +1,80 @@
 
-SET(CYCLES_VERSION_MAJOR 0)
-SET(CYCLES_VERSION_MINOR 0)
-SET(CYCLES_VERSION ${CYCLES_VERSION_MAJOR}.${CYCLES_VERSION_MINOR})
-
-# Options
-
-OPTION(WITH_CYCLES_OSL "Build with Open Shading Language support" OFF)
-OPTION(WITH_CYCLES_CUDA "Build with CUDA support" OFF)
-OPTION(WITH_CYCLES_OPENCL "Build with OpenCL support (not working)" OFF)
-OPTION(WITH_CYCLES_BLENDER "Build Blender Python extension" ON)
-OPTION(WITH_CYCLES_PARTIO "Build with Partio point cloud support (unfinished)" OFF)
-OPTION(WITH_CYCLES_NETWORK "Build with network rendering support (unfinished)" OFF)
-OPTION(WITH_CYCLES_MULTI "Build with network rendering support (unfinished)" OFF)
-OPTION(WITH_CYCLES_TEST "Build cycles test application" OFF)
-
-# Flags
-
-SET(CYCLES_CUDA_ARCH sm_10 sm_11 sm_12 sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build for")
-SET(CYCLES_CUDA_MAXREG 24 CACHE STRING "CUDA maximum number of register to use")
-
-# Paths
-
-IF(UNIX AND NOT APPLE)
-	SET(CYCLES_OIIO "" CACHE PATH "Path to OpenImageIO installation")
-	SET(CYCLES_BOOST "/usr" CACHE PATH "Path to Boost installation")
-ENDIF()
-
-SET(CYCLES_OSL "" CACHE PATH "Path to OpenShadingLanguage installation")
-SET(CYCLES_CUDA "/usr/local/cuda" CACHE PATH "Path to CUDA installation")
-SET(CYCLES_OPENCL "" CACHE PATH "Path to OpenCL installation")
-SET(CYCLES_PARTIO "" CACHE PATH "Path to Partio installation")
-SET(CYCLES_GLEW "" CACHE PATH "Path to GLEW installation")
-
-# Install, todo: deduplicate install path code
-
-if(MSVC_IDE)
-	set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE})
-elseif(APPLE)
-	set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE})
-else()
-	set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH})
-endif()
+set(CYCLES_INSTALL_PATH "scripts/addons/cycles")
+
+# External Libraries
+
+include(cmake/external_libs.cmake)
+
+# Build Flags
+
+set(GCC_WARNING_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-long-long")
+set(GCC_OPTIM_FLAGS "-ffast-math -fPIC -msse -msse2 -msse3 -mtune=native")
+
+if(APPLE)
+	set(CMAKE_CXX_FLAGS "${GCC_WARNING_FLAGS} ${GCC_OPTIM_FLAGS}")
+	set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
+endif(APPLE)
+
+if(WIN32)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Ox /Ot /arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /EHsc /fp:fast")
+	set(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
+endif(WIN32)
 
 if(UNIX AND NOT APPLE)
-	if(WITH_INSTALL_PORTABLE)
-		set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
-	else()
-		set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION})
-	endif()
-elseif(WIN32)
-	set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
-elseif(APPLE)
-	set(TARGETDIR_VER ${TARGETDIR}/blender.app/Contents/MacOS/${BLENDER_VERSION})
+	set(CMAKE_CXX_FLAGS "${GCC_WARNING_FLAGS} ${GCC_OPTIM_FLAGS}")
+	set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
+endif(UNIX AND NOT APPLE)
+
+# Definitions and Includes
+
+add_definitions(${BOOST_DEFINITIONS} ${OPENIMAGEIO_DEFINITIONS})
+
+add_definitions(-DCCL_NAMESPACE_BEGIN=namespace\ ccl\ {)
+add_definitions(-DCCL_NAMESPACE_END=})
+
+if(WITH_CYCLES_NETWORK)
+  add_definitions(-DWITH_NETWORK)
 endif()
 
-SET(CYCLES_INSTALL_PATH "${TARGETDIR_VER}/scripts/addons")
+if(WITH_CYCLES_MULTI)
+  add_definitions(-DWITH_MULTI)
+endif()
 
-# External Libraries
+if(WITH_CYCLES_CUDA)
+  add_definitions(-DWITH_CUDA)
+endif()
 
-INCLUDE(cmake/external_libs.cmake)
+if(WITH_CYCLES_OSL)
+  add_definitions(-DWITH_OSL)
+endif()
+
+if(WITH_CYCLES_PARTIO)
+  add_definitions(-DWITH_PARTIO)
+endif()
 
-# Platforms
+if(WITH_CYCLES_OPENCL)
+  add_definitions(-DWITH_OPENCL)
+  include_directories(${OPENCL_INCLUDE_DIR})
+
+endif()
 
-INCLUDE(cmake/platforms.cmake)
+include_directories(
+	${BOOST_INCLUDE_DIR}
+	${OPENIMAGEIO_INCLUDE_DIR}
+	${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO)
 
 # Subdirectories
 
-IF(WITH_CYCLES_BLENDER)
-	ADD_SUBDIRECTORY(blender)
-ENDIF(WITH_CYCLES_BLENDER)
-
-ADD_SUBDIRECTORY(app)
-ADD_SUBDIRECTORY(bvh)
-ADD_SUBDIRECTORY(device)
-ADD_SUBDIRECTORY(doc)
-ADD_SUBDIRECTORY(kernel)
-ADD_SUBDIRECTORY(render)
-ADD_SUBDIRECTORY(subd)
-ADD_SUBDIRECTORY(util)
+if(WITH_CYCLES_BLENDER)
+	add_subdirectory(blender)
+endif(WITH_CYCLES_BLENDER)
+
+add_subdirectory(app)
+add_subdirectory(bvh)
+add_subdirectory(device)
+add_subdirectory(doc)
+add_subdirectory(kernel)
+add_subdirectory(render)
+add_subdirectory(subd)
+add_subdirectory(util)
 
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt
index c250662aecf..1d74c32ca28 100644
--- a/intern/cycles/app/CMakeLists.txt
+++ b/intern/cycles/app/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-INCLUDE_DIRECTORIES(
+include_directories(
 	.
 	../device
 	../kernel
@@ -9,51 +9,51 @@ INCLUDE_DIRECTORIES(
 	../render
 	../subd)
 
-SET(LIBRARIES
+set(LIBRARIES
 	cycles_device
 	cycles_kernel
 	cycles_render
 	cycles_bvh
 	cycles_subd
 	cycles_util
-	${Boost_LIBRARIES}
+	${BOOST_LIBRARIES}
 	${OPENGL_LIBRARIES}
 	${CYCLES_GLEW_LIBRARY}
 	${OPENIMAGEIO_LIBRARY})
 
-IF(WITH_CYCLES_TEST)
-	LIST(APPEND LIBRARIES ${GLUT_LIBRARIES})
-ENDIF()
-
-IF(WITH_CYCLES_OSL)
-	LIST(APPEND LIBRARIES cycles_kernel_osl ${OSL_LIBRARIES})
-ENDIF()
-
-IF(WITH_CYCLES_PARTIO)
-	LIST(APPEND LIBRARIES ${PARTIO_LIBRARIES})
-ENDIF()
-
-IF(WITH_CYCLES_OPENCL)
-	LIST(APPEND LIBRARIES ${OPENCL_LIBRARIES})
-ENDIF()
-
-IF(WITH_CYCLES_TEST)
-	ADD_EXECUTABLE(cycles_test cycles_test.cpp cycles_xml.cpp cycles_xml.h)
-	TARGET_LINK_LIBRARIES(cycles_test ${LIBRARIES})
-	INSTALL(TARGETS cycles_test DESTINATION ${CYCLES_INSTALL_PATH}/cycles)
-
-	IF(UNIX AND NOT APPLE)
-		SET_TARGET_PROPERTIES(cycles_test PROPERTIES INSTALL_RPATH $ORIGIN/lib)
-	ENDIF()
-ENDIF()
-
-IF(WITH_CYCLES_NETWORK)
-	ADD_EXECUTABLE(cycles_server cycles_server.cpp)
-	TARGET_LINK_LIBRARIES(cycles_server ${LIBRARIES})
-	INSTALL(TARGETS cycles_server DESTINATION ${CYCLES_INSTALL_PATH}/cycles)
-
-	IF(UNIX AND NOT APPLE)
-		SET_TARGET_PROPERTIES(cycles_server PROPERTIES INSTALL_RPATH $ORIGIN/lib)
-	ENDIF()
-ENDIF()
+link_directories(${OPENIMAGEIO_LIBPATH} ${BOOST_LIBPATH})
+
+if(WITH_CYCLES_TEST)
+	list(APPEND LIBRARIES ${GLUT_LIBRARIES})
+endif()
+
+if(WITH_CYCLES_OSL)
+	list(APPEND LIBRARIES cycles_kernel_osl ${OSL_LIBRARIES})
+endif()
+
+if(WITH_CYCLES_PARTIO)
+	list(APPEND LIBRARIES ${PARTIO_LIBRARIES})
+endif()
+
+if(WITH_CYCLES_OPENCL)
+	list(APPEND LIBRARIES ${OPENCL_LIBRARIES})
+endif()
+
+if(WITH_CYCLES_TEST)
+	add_executable(cycles_test cycles_test.cpp cycles_xml.cpp cycles_xml.h)
+	target_link_libraries(cycles_test ${LIBRARIES})
+
+	if(UNIX AND NOT APPLE)
+		set_target_properties(cycles_test PROPERTIES INSTALL_RPATH $ORIGIN/lib)
+	endif()
+endif()
+
+if(WITH_CYCLES_NETWORK)
+	add_executable(cycles_server cycles_server.cpp)
+	target_link_libraries(cycles_server ${LIBRARIES})
+
+	if(UNIX AND NOT APPLE)
+		set_target_properties(cycles_server PROPERTIES INSTALL_RPATH $ORIGIN/lib)
+	endif()
+endif()
 
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
index 8d7f2b1504b..324d35d5360 100644
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -1,19 +1,18 @@
 
-SET(sources
+set(sources
 	blender_camera.cpp
 	blender_mesh.cpp
 	blender_object.cpp
 	blender_python.cpp
 	blender_session.cpp
 	blender_shader.cpp
-	blender_sync.cpp)
+	blender_sync.cpp
 
-SET(headers
 	blender_sync.h
 	blender_session.h
 	blender_util.h)
 
-SET(addonfiles
+set(addonfiles
 	addon/__init__.py
 	addon/engine.py 
 	addon/enums.py
@@ -21,7 +20,7 @@ SET(addonfiles
 	addon/ui.py
 	addon/xml.py)
 
-INCLUDE_DIRECTORIES(
+include_directories(
 	../render
 	../device
 	../kernel
@@ -32,78 +31,30 @@ INCLUDE_DIRECTORIES(
 	${PYTHON_INCLUDE_DIRS}
 	${GLEW_INCLUDE_PATH})
 
-SET(LIBRARIES
+set(LIBRARIES
 	cycles_render
 	cycles_bvh
 	cycles_device
 	cycles_kernel
 	cycles_util
-	cycles_subd
-	${Boost_LIBRARIES}
-	${OPENGL_LIBRARIES}
-	${OPENIMAGEIO_LIBRARY}
-	${GLUT_LIBRARIES}
-	${CYCLES_GLEW_LIBRARY}
-	${BLENDER_LIBRARIES})
+	cycles_subd)
 
-IF(WITH_CYCLES_OSL)
-	LIST(APPEND LIBRARIES cycles_kernel_osl ${OSL_LIBRARIES})
-ENDIF()
+if(WITH_CYCLES_OSL)
+	list(APPEND LIBRARIES cycles_kernel_osl ${OSL_LIBRARIES})
+endif()
 
-IF(WITH_CYCLES_PARTIO)
-	LIST(APPEND LIBRARIES ${PARTIO_LIBRARIES})
-ENDIF()
+if(WITH_CYCLES_PARTIO)
+	list(APPEND LIBRARIES ${PARTIO_LIBRARIES})
+endif()
 
-IF(WITH_CYCLES_OPENCL)
-	LIST(APPEND LIBRARIES ${OPENCL_LIBRARIES})
-ENDIF()
+if(WITH_CYCLES_OPENCL)
+	list(APPEND LIBRARIES ${OPENCL_LIBRARIES})
+endif()
 
-LINK_DIRECTORIES(${PYTHON_LIBPATH})
-SET(CMAKE_MODULE_LINKER_FLAGS ${PYTHON_MODULE_FLAGS})
+blender_add_lib(bf_intern_cycles "${sources}" "" "")
 
-ADD_LIBRARY(cycles_blender MODULE ${sources} ${headers})
-ADD_DEPENDENCIES(cycles_blender bf_rna)
+add_dependencies(bf_intern_cycles bf_rna)
+target_link_libraries(bf_intern_cycles ${LIBRARIES})
 
-IF(WIN32)
-	TARGET_LINK_LIBRARIES(cycles_blender ${PYTHON_LINKFLAGS})
-
-	FILE_LIST_SUFFIX(PYTHON_LIBRARIES_DEBUG "${PYTHON_LIBRARIES}" "_d")
-	TARGET_LINK_LIBRARIES_DEBUG(cycles_blender "${PYTHON_LIBRARIES_DEBUG}")
-	TARGET_LINK_LIBRARIES_OPTIMIZED(cycles_blender "${PYTHON_LIBRARIES}")
-	UNSET(PYTHON_LIBRARIES_DEBUG)
-
-	SET_TARGET_PROPERTIES(cycles_blender PROPERTIES PREFIX "lib")
-	SET_TARGET_PROPERTIES(cycles_blender PROPERTIES SUFFIX ".pyd")
-ENDIF()
-
-TARGET_LINK_LIBRARIES(cycles_blender ${LIBRARIES})
-
-INSTALL(FILES ${addonfiles} DESTINATION ${CYCLES_INSTALL_PATH}/cycles)
-INSTALL(TARGETS cycles_blender LIBRARY DESTINATION ${CYCLES_INSTALL_PATH}/cycles)
-
-# Install Dynamic Libraries
-
-IF(WIN32)
-	FILE(GLOB OIIO_DLLS "${CYCLES_OIIO}/bin/*.dll")
-	INSTALL(FILES ${OIIO_DLLS}
-		DESTINATION ${CYCLES_INSTALL_PATH}/cycles)
-ENDIF()
-
-IF(UNIX AND NOT APPLE)
-	# copy libraries to cycles lib directory
-	SET(install_libs
-		${OPENIMAGEIO_LIBRARY}
-		${Boost_LIBRARIES}
-		${OSL_LIBRARIES}
-		${PARTIO_LIBRARIES})
-	
-	LIST(REMOVE_ITEM install_libs optimized)
-	LIST(REMOVE_ITEM install_libs debug)
-
-	INSTALL(FILES ${install_libs}
-		DESTINATION ${CYCLES_INSTALL_PATH}/cycles/lib)
-	
-	# set path to look for dynamic libs
-	SET_TARGET_PROPERTIES(cycles_blender PROPERTIES INSTALL_RPATH $ORIGIN/lib)
-ENDIF()
+delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${addonfiles}" ${CYCLES_INSTALL_PATH})
 
diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py
index a78107735eb..6879efcb24e 100644
--- a/intern/cycles/blender/addon/engine.py
+++ b/intern/cycles/blender/addon/engine.py
@@ -19,12 +19,12 @@
 import bpy
 
 def init():
-	from cycles import libcycles_blender as lib
+	import libcycles_blender as lib
 	import os.path
 	lib.init(os.path.dirname(__file__))
 
 def create(engine, data, scene, region = 0, v3d = 0, rv3d = 0):
-	from cycles import libcycles_blender as lib
+	import libcycles_blender as lib
 
 	data = data.as_pointer()
 	scene = scene.as_pointer()
@@ -40,20 +40,20 @@ def create(engine, data, scene, region = 0, v3d = 0, rv3d = 0):
 def free(engine):
 	if "session" in dir(engine):
 		if engine.session:
-			from cycles import libcycles_blender as lib
+			import libcycles_blender as lib
 			lib.free(engine.session)
 		del engine.session
 
 def render(engine):
-	from cycles import libcycles_blender as lib
+	import libcycles_blender as lib
 	lib.render(engine.session)
 
 def update(engine, data, scene):
-	from cycles import libcycles_blender as lib
+	import libcycles_blender as lib
 	lib.sync(engine.session)
 
 def draw(engine, region, v3d, rv3d):
-	from cycles import libcycles_blender as lib
+	import libcycles_blender as lib
 	v3d = v3d.as_pointer()
 	rv3d = rv3d.as_pointer()
 
@@ -95,10 +95,10 @@ def draw(engine, region, v3d, rv3d):
 		blf.draw(fontid, substatus)
 
 def available_devices():
-	from cycles import libcycles_blender as lib
+	import libcycles_blender as lib
 	return lib.available_devices()
 
 def with_osl():
-	from cycles import libcycles_blender as lib
+	import libcycles_blender as lib
 	return lib.with_osl()
 
diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp
index 00d16edbf74..1e72e5f15f1 100644
--- a/intern/cycles/blender/blender_python.cpp
+++ b/intern/cycles/blender/blender_python.cpp
@@ -224,7 +224,9 @@ static struct PyModuleDef module = {
 
 CCL_NAMESPACE_END
 
-PyMODINIT_FUNC PyInit_libcycles_blender() 
+extern "C" PyObject *CYCLES_initPython();
+
+PyObject *CYCLES_initPython()
 {
 	return PyModule_Create(&ccl::module);
 }
diff --git a/intern/cycles/bvh/CMakeLists.txt b/intern/cycles/bvh/CMakeLists.txt
index 9ea3bc77461..b35c20b7a38 100644
--- a/intern/cycles/bvh/CMakeLists.txt
+++ b/intern/cycles/bvh/CMakeLists.txt
@@ -1,18 +1,18 @@
 
-INCLUDE_DIRECTORIES(. ../kernel ../kernel/svm ../render ../util ../device)
+include_directories(. ../kernel ../kernel/svm ../render ../util ../device)
 
-SET(sources
+set(sources
 	bvh.cpp
 	bvh_build.cpp
 	bvh_node.cpp
 	bvh_sort.cpp)
 
-SET(headers
+set(headers
 	bvh.h
 	bvh_build.h
 	bvh_node.h
 	bvh_params.h
 	bvh_sort.h)
 
-ADD_LIBRARY(cycles_bvh ${sources} ${headers})
+add_library(cycles_bvh ${sources} ${headers})
 
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake
index 6da71c8235f..01f3cc1af0d 100644
--- a/intern/cycles/cmake/external_libs.cmake
+++ b/intern/cycles/cmake/external_libs.cmake
@@ -1,227 +1,133 @@
-###########################################################################
-# Windows and Darwin lib directory libraries
-
-IF(WIN32)
-	IF(CMAKE_CL_64)
-		SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
-	ELSE()
-		SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
-	ENDIF()
-ENDIF()
-
-IF(APPLE)
-	SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-9.x.universal)
-	SET(OIIO_STATIC ON)
-ENDIF()
-
-IF(LIBDIR)
-	SET(CYCLES_OIIO ${LIBDIR}/openimageio)
-	SET(CYCLES_BOOST ${LIBDIR}/boost)
-   	SET(Boost_USE_STATIC_LIBS ON)
-ENDIF()
-
-###########################################################################
-# Boost setup
-
-SET(BOOST_ROOT ${CYCLES_BOOST})
-
-SET(Boost_ADDITIONAL_VERSIONS "1.45" "1.44" 
-                               "1.43" "1.43.0" "1.42" "1.42.0" 
-                               "1.41" "1.41.0" "1.40" "1.40.0"
-                               "1.39" "1.39.0" "1.38" "1.38.0"
-                               "1.37" "1.37.0" "1.34.1" "1_34_1")
-
-SET(Boost_USE_MULTITHREADED ON)
-
-FIND_PACKAGE(Boost 1.34 REQUIRED COMPONENTS filesystem regex system thread)
-
-MESSAGE(STATUS "Boost found ${Boost_FOUND}")
-MESSAGE(STATUS "Boost version ${Boost_VERSION}")
-MESSAGE(STATUS "Boost include dirs ${Boost_INCLUDE_DIRS}")
-MESSAGE(STATUS "Boost library dirs ${Boost_LIBRARY_DIRS}")
-MESSAGE(STATUS "Boost libraries ${Boost_LIBRARIES}")
-
-INCLUDE_DIRECTORIES("${Boost_INCLUDE_DIRS}")
-LINK_DIRECTORIES("${Boost_LIBRARY_DIRS}")
-
-ADD_DEFINITIONS(-DBOOST_ALL_NO_LIB)
-
-IF(WITH_CYCLES_NETWORK)
-	ADD_DEFINITIONS(-DWITH_NETWORK)
-ENDIF()
-
-IF(WITH_CYCLES_MULTI)
-	ADD_DEFINITIONS(-DWITH_MULTI)
-ENDIF()
-
-###########################################################################
-# OpenImageIO
-
-FIND_LIBRARY(OPENIMAGEIO_LIBRARY NAMES OpenImageIO PATHS ${CYCLES_OIIO}/lib ${CYCLES_OIIO}/dist)
-FIND_PATH(OPENIMAGEIO_INCLUDES OpenImageIO/imageio.h PATHS ${CYCLES_OIIO}/include ${CYCLES_OIIO}/dist)
-FIND_PROGRAM(OPENIMAGEIO_IDIFF NAMES idiff PATHS ${CYCLES_OIIO}/bin ${CYCLES_OIIO}/dist)
-
-IF(OPENIMAGEIO_INCLUDES AND OPENIMAGEIO_LIBRARY)
-	SET(OPENIMAGEIO_FOUND TRUE)
-	MESSAGE(STATUS "OpenImageIO includes = ${OPENIMAGEIO_INCLUDES}")
-	MESSAGE(STATUS "OpenImageIO library = ${OPENIMAGEIO_LIBRARY}")
-ELSE()
-	MESSAGE(STATUS "OpenImageIO not found")
-ENDIF()
-
-ADD_DEFINITIONS(-DWITH_OIIO)
-INCLUDE_DIRECTORIES(${OPENIMAGEIO_INCLUDES} ${OPENIMAGEIO_INCLUDES}/OpenImageIO)
-
-IF(OIIO_STATIC)
-	ADD_DEFINITIONS(-DOIIO_STATIC_BUILD)
-
-	SET(OPENIMAGEIO_LIBRARY
-		${OPENIMAGEIO_LIBRARY}
-		${PNG_LIBRARIES}
-		${JPEG_LIBRARIES}
-		${TIFF_LIBRARY}
-		${OPENEXR_LIBRARIES}
-		${ZLIB_LIBRARIES})
-
-	LINK_DIRECTORIES(
-		${JPEG_LIBPATH}
-		${PNG_LIBPATH}
-		${TIFF_LIBPATH}
-		${OPENEXR_LIBPATH}
-		${ZLIB_LIBPATH})
-ENDIF()
 
 ###########################################################################
 # GLUT
 
-IF(WITH_CYCLES_TEST)
-	SET(GLUT_ROOT_PATH ${CYCLES_GLUT})
+if(WITH_CYCLES_TEST)
+	set(GLUT_ROOT_PATH ${CYCLES_GLUT})
 
-	FIND_PACKAGE(GLUT)
-	MESSAGE(STATUS "GLUT_FOUND=${GLUT_FOUND}")
+	find_package(GLUT)
+	message(STATUS "GLUT_FOUND=${GLUT_FOUND}")
 
-	INCLUDE_DIRECTORIES(${GLUT_INCLUDE_DIR})
-ENDIF()
+	include_directories(${GLUT_INCLUDE_DIR})
+endif()
 
-IF(WITH_BUILTIN_GLEW)
-	SET(CYCLES_GLEW_LIBRARY extern_glew)
-ELSE()
-	SET(CYCLES_GLEW_LIBRARY ${GLEW_LIBRARY})
-ENDIF()
+if(WITH_BUILTIN_GLEW)
+	set(CYCLES_GLEW_LIBRARY extern_glew)
+else()
+	set(CYCLES_GLEW_LIBRARY ${GLEW_LIBRARY})
+endif()
 
 ###########################################################################
 # OpenShadingLanguage
 
-IF(WITH_CYCLES_OSL)
+if(WITH_CYCLES_OSL)
+
+	set(CYCLES_OSL "" CACHE PATH "Path to OpenShadingLanguage installation")
 
-	MESSAGE(STATUS "CYCLES_OSL = ${CYCLES_OSL}")
+	message(STATUS "CYCLES_OSL = ${CYCLES_OSL}")
 
-	FIND_LIBRARY(OSL_LIBRARIES NAMES oslexec oslcomp oslquery PATHS ${CYCLES_OSL}/lib ${CYCLES_OSL}/dist)
-	FIND_PATH(OSL_INCLUDES OSL/oslclosure.h PATHS ${CYCLES_OSL}/include ${CYCLES_OSL}/dist)
-	FIND_PROGRAM(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin ${CYCLES_OSL}/dist)
+	find_library(OSL_LIBRARIES NAMES oslexec oslcomp oslquery PATHS ${CYCLES_OSL}/lib ${CYCLES_OSL}/dist)
+	find_path(OSL_INCLUDES OSL/oslclosure.h PATHS ${CYCLES_OSL}/include ${CYCLES_OSL}/dist)
+	find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin ${CYCLES_OSL}/dist)
 
-	IF(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER)
-		SET(OSL_FOUND TRUE)
-		MESSAGE(STATUS "OSL includes = ${OSL_INCLUDES}")
-		MESSAGE(STATUS "OSL library = ${OSL_LIBRARIES}")
-		MESSAGE(STATUS "OSL compiler = ${OSL_COMPILER}")
-	ELSE()
-		MESSAGE(STATUS "OSL not found")
-	ENDIF()
+	if(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER)
+		set(OSL_FOUND TRUE)
+		message(STATUS "OSL includes = ${OSL_INCLUDES}")
+		message(STATUS "OSL library = ${OSL_LIBRARIES}")
+		message(STATUS "OSL compiler = ${OSL_COMPILER}")
+	else()
+		message(STATUS "OSL not found")
+	endif()
 
-	ADD_DEFINITIONS(-DWITH_OSL)
-	INCLUDE_DIRECTORIES(${OSL_INCLUDES} ${OSL_INCLUDES}/OSL ${OSL_INCLUDES}/../../../src/liboslexec)
+	include_directories(${OSL_INCLUDES} ${OSL_INCLUDES}/OSL ${OSL_INCLUDES}/../../../src/liboslexec)
 
-ENDIF()
+endif()
 
 ###########################################################################
 # Partio
 
-IF(WITH_CYCLES_PARTIO)
+if(WITH_CYCLES_PARTIO)
 
-	MESSAGE(STATUS "CYCLES_PARTIO = ${CYCLES_PARTIO}")
+	set(CYCLES_PARTIO "" CACHE PATH "Path to Partio installation")
 
-	FIND_LIBRARY(PARTIO_LIBRARIES NAMES partio PATHS ${CYCLES_PARTIO}/lib)
-	FIND_PATH(PARTIO_INCLUDES Partio.h ${CYCLES_PARTIO}/include)
+	message(STATUS "CYCLES_PARTIO = ${CYCLES_PARTIO}")
 
-	FIND_PACKAGE(ZLIB)
+	find_library(PARTIO_LIBRARIES NAMES partio PATHS ${CYCLES_PARTIO}/lib)
+	find_path(PARTIO_INCLUDES Partio.h ${CYCLES_PARTIO}/include)
 
-	IF(PARTIO_INCLUDES AND PARTIO_LIBRARIES AND ZLIB_LIBRARIES)
-		LIST(APPEND PARTIO_LIBRARIES ${ZLIB_LIBRARIES})
-		SET(PARTIO_FOUND TRUE)
-		MESSAGE(STATUS "PARTIO includes = ${PARTIO_INCLUDES}")
-		MESSAGE(STATUS "PARTIO library = ${PARTIO_LIBRARIES}")
-	ELSE()
-		MESSAGE(STATUS "PARTIO not found")
-	ENDIF()
+	find_package(ZLIB)
 
-	ADD_DEFINITIONS(-DWITH_PARTIO)
-	INCLUDE_DIRECTORIES(${PARTIO_INCLUDES})
+	if(PARTIO_INCLUDES AND PARTIO_LIBRARIES AND ZLIB_LIBRARIES)
+		list(APPEND PARTIO_LIBRARIES ${ZLIB_LIBRARIES})
+		set(PARTIO_FOUND TRUE)
+		message(STATUS "PARTIO includes = ${PARTIO_INCLUDES}")
+		message(STATUS "PARTIO library = ${PARTIO_LIBRARIES}")
+	else()
+		message(STATUS "PARTIO not found")
+	endif()
 
-ENDIF()
+	include_directories(${PARTIO_INCLUDES})
+
+endif()
 
 ###########################################################################
 # Blender
 
-IF(WITH_CYCLES_BLENDER)
-	# FIND_PATH(BLENDER_INCLUDE_DIRS RNA_blender.h PATHS ${CMAKE_BINARY_DIR}/include)
-	SET(BLENDER_INCLUDE_DIRS
+if(WITH_CYCLES_BLENDER)
+
+	set(BLENDER_INCLUDE_DIRS
 		${CMAKE_SOURCE_DIR}/intern/guardedalloc
 		${CMAKE_SOURCE_DIR}/source/blender/makesdna
 		${CMAKE_SOURCE_DIR}/source/blender/makesrna
 		${CMAKE_SOURCE_DIR}/source/blender/blenloader
 		${CMAKE_BINARY_DIR}/source/blender/makesrna/intern)
-	IF(WIN32)
-		SET(BLENDER_LIBRARIES ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/blender.lib)
-	ENDIF()
 
 	ADD_DEFINITIONS(-DBLENDER_PLUGIN)
-ENDIF()
+endif()
 
 ###########################################################################
 # CUDA
 
-IF(WITH_CYCLES_CUDA)
+if(WITH_CYCLES_CUDA)
+
+	set(CYCLES_CUDA "/usr/local/cuda" CACHE PATH "Path to CUDA installation")
+	set(CYCLES_CUDA_ARCH sm_10 sm_11 sm_12 sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build for")
+	set(CYCLES_CUDA_MAXREG 24 CACHE STRING "CUDA maximum number of register to use")
 
-	FIND_LIBRARY(CUDA_LIBRARIES NAMES cuda PATHS ${CYCLES_CUDA}/lib ${CYCLES_CUDA}/lib/Win32 NO_DEFAULT_PATH)
-	FIND_PATH(CUDA_INCLUDES cuda.h ${CYCLES_CUDA}/include NO_DEFAULT_PATH)
-	FIND_PROGRAM(CUDA_NVCC NAMES nvcc PATHS ${CYCLES_CUDA}/bin NO_DEFAULT_PATH)
+	find_library(CUDA_LIBRARIES NAMES cuda PATHS ${CYCLES_CUDA}/lib ${CYCLES_CUDA}/lib/Win32 NO_DEFAULT_PATH)
+	find_path(CUDA_INCLUDES cuda.h ${CYCLES_CUDA}/include NO_DEFAULT_PATH)
+	find_program(CUDA_NVCC NAMES nvcc PATHS ${CYCLES_CUDA}/bin NO_DEFAULT_PATH)
 
-	IF(CUDA_INCLUDES AND CUDA_LIBRARIES AND CUDA_NVCC)
-		MESSAGE(STATUS "CUDA includes = ${CUDA_INCLUDES}")
-		MESSAGE(STATUS "CUDA library = ${CUDA_LIBRARIES}")
-		MESSAGE(STATUS "CUDA nvcc = ${CUDA_NVCC}")
-	ELSE()
-		MESSAGE(STATUS "CUDA not found")
-	ENDIF()
+	if(CUDA_INCLUDES AND CUDA_LIBRARIES AND CUDA_NVCC)
+		message(STATUS "CUDA includes = ${CUDA_INCLUDES}")
+		message(STATUS "CUDA library = ${CUDA_LIBRARIES}")
+		message(STATUS "CUDA nvcc = ${CUDA_NVCC}")
+	else()
+		message(STATUS "CUDA not found")
+	endif()
 
-	ADD_DEFINITIONS(-DWITH_CUDA)
-	INCLUDE_DIRECTORIES(${CUDA_INCLUDES})
+	include_directories(${CUDA_INCLUDES})
 
-ENDIF()
+endif()
 
 ###########################################################################
 # OpenCL
 
-IF(WITH_CYCLES_OPENCL)
-
-	IF(APPLE)
-		SET(OPENCL_INCLUDES "/System/Library/Frameworks/OpenCL.framework/Headers")
-		SET(OPENCL_LIBRARIES "-framework OpenCL")
-	ENDIF()
-
-	IF(WIN32)
-		SET(OPENCL_INCLUDES "")
-		SET(OPENCL_LIBRARIES "OpenCL")
-	ENDIF()
+if(WITH_CYCLES_OPENCL)
 
-	IF(UNIX AND NOT APPLE)
-		SET(OPENCL_INCLUDES ${CYCLES_OPENCL})
-		SET(OPENCL_LIBRARIES "OpenCL")
-	ENDIF()
+	if(APPLE)
+		set(OPENCL_INCLUDE_DIR "/System/Library/Frameworks/OpenCL.framework/Headers")
+		set(OPENCL_LIBRARIES "-framework OpenCL")
+	endif()
 
-	ADD_DEFINITIONS(-DWITH_OPENCL)
-	INCLUDE_DIRECTORIES(${OPENCL_INCLUDES})
+	if(WIN32)
+		set(OPENCL_INCLUDE_DIR "")
+		set(OPENCL_LIBRARIES "OpenCL")
+	endif()
 
-ENDIF()
+	if(UNIX AND NOT APPLE)
+		set(OPENCL_INCLUDE_DIR ${CYCLES_OPENCL})
+		set(OPENCL_LIBRARIES "OpenCL")
+	endif()
+endif()
 
diff --git a/intern/cycles/cmake/platforms.cmake b/intern/cycles/cmake/platforms.cmake
deleted file mode 100644
index e4364d8fc5d..00000000000
--- a/intern/cycles/cmake/platforms.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-
-# Platform specific build flags
-
-SET(GCC_WARNING_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-long-long")
-SET(GCC_OPTIM_FLAGS "-ffast-math -fPIC -msse -msse2 -msse3 -mtune=native")
-
-IF(APPLE)
-	SET(CMAKE_CXX_FLAGS "${GCC_WARNING_FLAGS} ${GCC_OPTIM_FLAGS}")
-	SET(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
-	SET(PYTHON_MODULE_FLAGS "-undefined dynamic_lookup")
-ENDIF(APPLE)
-
-IF(WIN32)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Ox /Ot /arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /EHsc /fp:fast")
-	SET(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
-	SET(PYTHON_MODULE_FLAGS "-DLL")
-ENDIF(WIN32)
-
-IF(UNIX AND NOT APPLE)
-	SET(CMAKE_CXX_FLAGS "${GCC_WARNING_FLAGS} ${GCC_OPTIM_FLAGS}")
-	SET(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
-	SET(PYTHON_MODULE_FLAGS "-fPIC")
-ENDIF(UNIX AND NOT APPLE)
-
-ADD_DEFINITIONS(-DCCL_NAMESPACE_BEGIN=namespace\ ccl\ {)
-ADD_DEFINITIONS(-DCCL_NAMESPACE_END=})
-
diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt
index 712351b9558..55941438720 100644
--- a/intern/cycles/device/CMakeLists.txt
+++ b/intern/cycles/device/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-INCLUDE_DIRECTORIES(
+include_directories(
 	.
 	../kernel
 	../kernel/svm
@@ -9,7 +9,7 @@ INCLUDE_DIRECTORIES(
 	${OPENGL_INCLUDE_DIR}
 	${GLEW_INCLUDE_PATH})
 
-SET(sources
+set(sources
 	device.cpp
 	device_cpu.cpp
 	device_cuda.cpp
@@ -17,10 +17,10 @@ SET(sources
 	device_network.cpp
 	device_opencl.cpp)
 
-SET(headers
+set(headers
 	device.h
 	device_intern.h
 	device_network.h)
 
-ADD_LIBRARY(cycles_device ${sources} ${headers})
+add_library(cycles_device ${sources} ${headers})
 
diff --git a/intern/cycles/doc/CMakeLists.txt b/intern/cycles/doc/CMakeLists.txt
index 584bcc8079c..4ae0d12a060 100644
--- a/intern/cycles/doc/CMakeLists.txt
+++ b/intern/cycles/doc/CMakeLists.txt
@@ -1,3 +1,3 @@
 
-INSTALL(DIRECTORY license DESTINATION ${CYCLES_INSTALL_PATH}/cycles PATTERN ".svn" EXCLUDE)
+add_subdirectory(license)
 
diff --git a/intern/cycles/doc/license/CMakeLists.txt b/intern/cycles/doc/license/CMakeLists.txt
new file mode 100644
index 00000000000..14049d4a88a
--- /dev/null
+++ b/intern/cycles/doc/license/CMakeLists.txt
@@ -0,0 +1,13 @@
+
+set(licenses
+	Apache_2.0.txt
+	Blender.txt
+	GPL.txt
+	ILM.txt
+	NVidia.txt
+	OSL.txt
+	Sobol.txt
+	readme.txt)
+
+delayed_install(${CMAKE_CURRENT_SOURCE_DIR}  "${licenses}" ${CYCLES_INSTALL_PATH}/license)
+
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index b6d758369cc..7c77bf7ff82 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -1,10 +1,10 @@
 
-SET(sources
+set(sources
 	kernel.cpp
 	kernel.cl
 	kernel.cu)
 
-SET(headers
+set(headers
 	kernel.h
 	kernel_bvh.h
 	kernel_camera.h
@@ -29,7 +29,7 @@ SET(headers
 	kernel_triangle.h
 	kernel_types.h)
 
-SET(svm_headers
+set(svm_headers
 	svm/bsdf.h
 	svm/bsdf_ashikhmin_velvet.h
 	svm/bsdf_diffuse.h
@@ -72,7 +72,7 @@ SET(svm_headers
 	svm/volume.h
 	)
 
-SET(util_headers
+set(util_headers
 	../util/util_color.h
 	../util/util_math.h
 	../util/util_transform.h
@@ -80,60 +80,61 @@ SET(util_headers
 
 # CUDA module
 
-IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-	SET(CUDA_BITS 64)
-ELSE()
-	SET(CUDA_BITS 32)
-ENDIF()
+if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+	set(CUDA_BITS 64)
+else()
+	set(CUDA_BITS 32)
+endif()
 
-IF(WITH_CYCLES_CUDA)
-	SET(cuda_sources kernel.cu ${headers} ${svm_headers})
-	SET(cuda_cubins)
+if(WITH_CYCLES_CUDA)
+	set(cuda_sources kernel.cu ${headers} ${svm_headers})
+	set(cuda_cubins)
 
-	FOREACH(arch ${CYCLES_CUDA_ARCH})
-		SET(cuda_cubin kernel_${arch}.cubin)
+	foreach(arch ${CYCLES_CUDA_ARCH})
+		set(cuda_cubin kernel_${arch}.cubin)
 
-		ADD_CUSTOM_COMMAND(
+		add_custom_command(
 			OUTPUT ${cuda_cubin}
 			COMMAND ${CUDA_NVCC} -arch=${arch} -m${CUDA_BITS} --cubin ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cu --use_fast_math -o ${CMAKE_CURRENT_BINARY_DIR}/${cuda_cubin} --ptxas-options="-v" --maxrregcount=${CYCLES_CUDA_MAXREG} --opencc-options -OPT:Olimit=0 -I${CMAKE_CURRENT_SOURCE_DIR}/../util -I${CMAKE_CURRENT_SOURCE_DIR}/svm -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DNVCC
 			DEPENDS ${cuda_sources})
 
-		INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${cuda_cubin} DESTINATION ${CYCLES_INSTALL_PATH}/cycles/lib)
-		LIST(APPEND cuda_cubins ${cuda_cubin})
-	ENDFOREACH()
+		delayed_install("${CMAKE_CURRENT_BINARY_DIR}" "${cuda_cubin}" ${CYCLES_INSTALL_PATH}/lib)
+		list(APPEND cuda_cubins ${cuda_cubin})
+	endforeach()
 
-	ADD_CUSTOM_TARGET(cycles_kernel_cuda ALL DEPENDS ${cuda_cubins})
-ENDIF()
+	add_custom_target(cycles_kernel_cuda ALL DEPENDS ${cuda_cubins})
+endif()
 
 # OSL module
 
-IF(WITH_CYCLES_OSL)
-	ADD_SUBDIRECTORY(osl)
-ENDIF()
+if(WITH_CYCLES_OSL)
+	add_subdirectory(osl)
+endif()
 
 # CPU module
 
-INCLUDE_DIRECTORIES(. ../util osl svm)
+include_directories(. ../util osl svm)
 
-ADD_LIBRARY(cycles_kernel ${sources} ${headers} ${svm_headers})
+add_library(cycles_kernel ${sources} ${headers} ${svm_headers})
 
-IF(WITH_CYCLES_CUDA)
-	ADD_DEPENDENCIES(cycles_kernel cycles_kernel_cuda)
-ENDIF()
+if(WITH_CYCLES_CUDA)
+	add_dependencies(cycles_kernel cycles_kernel_cuda)
+endif()
 
 # OPENCL kernel
 
-IF(WITH_CYCLES_OPENCL)
-	#SET(kernel_preprocessed ${CMAKE_CURRENT_BINARY_DIR}/kernel_preprocessed.cl)
-	#ADD_CUSTOM_COMMAND(
+if(WITH_CYCLES_OPENCL)
+	#set(kernel_preprocessed ${CMAKE_CURRENT_BINARY_DIR}/kernel_preprocessed.cl)
+	#add_custom_command(
 	#	OUTPUT ${kernel_preprocessed}
 	#	COMMAND gcc -x c++ -E ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cl -I ${CMAKE_CURRENT_SOURCE_DIR}/../util/ -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DWITH_OPENCL -o ${kernel_preprocessed}
 	#	DEPENDS ${kernel_sources} ${util_headers})
-	#ADD_CUSTOM_TARGET(cycles_kernel_preprocess ALL DEPENDS ${kernel_preprocessed})
-	#INSTALL(FILES ${kernel_preprocessed} DESTINATION ${CYCLES_INSTALL_PATH}/cycles/kernel)
-
-	INSTALL(FILES kernel.cl ${headers} DESTINATION ${CYCLES_INSTALL_PATH}/cycles/kernel)
-	INSTALL(FILES ${svm_headers} DESTINATION ${CYCLES_INSTALL_PATH}/cycles/kernel/svm)
-	INSTALL(FILES ${util_headers} DESTINATION ${CYCLES_INSTALL_PATH}/cycles/kernel)
-ENDIF()
+	#add_custom_target(cycles_kernel_preprocess ALL DEPENDS ${kernel_preprocessed})
+	#delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${kernel_preprocessed}" ${CYCLES_INSTALL_PATH}/kernel)
+
+	delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel.cl" ${CYCLES_INSTALL_PATH}/kernel)
+	delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${headers}" ${CYCLES_INSTALL_PATH}/kernel)
+	delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${svm_headers}" ${CYCLES_INSTALL_PATH}/kernel/svm)
+	delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${util_headers}" ${CYCLES_INSTALL_PATH}/kernel)
+endif()
 
diff --git a/intern/cycles/kernel/osl/CMakeLists.txt b/intern/cycles/kernel/osl/CMakeLists.txt
index 31a162bdd0e..4a3a6f6798a 100644
--- a/intern/cycles/kernel/osl/CMakeLists.txt
+++ b/intern/cycles/kernel/osl/CMakeLists.txt
@@ -1,7 +1,7 @@
 
-INCLUDE_DIRECTORIES(. ../ ../svm ../../render ../../util ../../device)
+include_directories(. ../ ../svm ../../render ../../util ../../device)
 
-SET(sources
+set(sources
 	background.cpp
 	bsdf_ashikhmin_velvet.cpp
 	bsdf_diffuse.cpp
@@ -19,15 +19,15 @@ SET(sources
 	osl_shader.cpp
 	vol_subsurface.cpp)
 
-SET(headers
+set(headers
 	osl_closures.h
 	osl_globals.h
 	osl_services.h
 	osl_shader.h)
 
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
 
-ADD_LIBRARY(cycles_kernel_osl ${sources} ${headers})
+add_library(cycles_kernel_osl ${sources} ${headers})
 
-ADD_SUBDIRECTORY(nodes)
+add_subdirectory(nodes)
 
diff --git a/intern/cycles/kernel/osl/nodes/CMakeLists.txt b/intern/cycles/kernel/osl/nodes/CMakeLists.txt
index 56e8ba0b5b6..365cc42ad6b 100644
--- a/intern/cycles/kernel/osl/nodes/CMakeLists.txt
+++ b/intern/cycles/kernel/osl/nodes/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 # OSL node shaders
 
-SET(osl_sources
+set(osl_sources
 	node_add_closure.osl
 	node_attribute.osl
 	node_background.osl
@@ -46,24 +46,24 @@ SET(osl_sources
 	node_ward_bsdf.osl
 	node_wood_texture.osl)
 
-SET(osl_headers
+set(osl_headers
 	node_texture.h
 	stdosl.h)
 
-SET(oso_sources)
+set(oso_sources)
 
-FOREACH(_file ${osl_sources})
-	SET(osl_file ${CMAKE_CURRENT_SOURCE_DIR}/${_file})
-	STRING(REPLACE ".osl" ".oso" oso_file ${osl_file})
-	STRING(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} oso_file ${oso_file})
-	ADD_CUSTOM_COMMAND(
+foreach(_file ${osl_sources})
+	set(osl_file ${CMAKE_CURRENT_SOURCE_DIR}/${_file})
+	string(REPLACE ".osl" ".oso" oso_file ${osl_file})
+	string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} oso_file ${oso_file})
+	add_custom_command(
 		OUTPUT ${oso_file} 
 		COMMAND ${OSL_COMPILER} -O2 ${osl_file}
 		DEPENDS ${osl_file} ${osl_headers})
-	LIST(APPEND oso_sources ${oso_file})
-ENDFOREACH()
+	list(APPEND oso_sources ${oso_file})
+endforeach()
 
-ADD_CUSTOM_TARGET(shader ALL DEPENDS ${oso_sources} ${osl_headers})
+add_custom_target(shader ALL DEPENDS ${oso_sources} ${osl_headers})
 
-INSTALL(FILES ${oso_sources} DESTINATION ${CYCLES_INSTALL_PATH}/cycles/shader)
+delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${oso_sources}" ${CYCLES_INSTALL_PATH}/shader)
 
diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt
index 9a0583c48aa..c3d5ae1ea05 100644
--- a/intern/cycles/render/CMakeLists.txt
+++ b/intern/cycles/render/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-INCLUDE_DIRECTORIES(
+include_directories(
 	.
 	../device
 	../kernel
@@ -9,7 +9,7 @@ INCLUDE_DIRECTORIES(
 	../util
 	${GLEW_INCLUDE_PATH})
 
-SET(sources
+set(sources
 	attribute.cpp
 	background.cpp
 	buffers.cpp
@@ -33,7 +33,7 @@ SET(sources
 	svm.cpp
 	tile.cpp)
 
-SET(headers
+set(headers
 	attribute.h
 	background.h
 	buffers.h
@@ -56,7 +56,7 @@ SET(headers
 	svm.h
 	tile.h)
 
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
 
-ADD_LIBRARY(cycles_render ${sources} ${headers})
+add_library(cycles_render ${sources} ${headers})
 
diff --git a/intern/cycles/subd/CMakeLists.txt b/intern/cycles/subd/CMakeLists.txt
index 5357df4fab7..79ed73134f2 100644
--- a/intern/cycles/subd/CMakeLists.txt
+++ b/intern/cycles/subd/CMakeLists.txt
@@ -1,7 +1,7 @@
 
-INCLUDE_DIRECTORIES(. ../util ../kernel ../kernel/svm ../render)
+include_directories(. ../util ../kernel ../kernel/svm ../render)
 
-SET(sources
+set(sources
 	subd_build.cpp
 	subd_dice.cpp
 	subd_mesh.cpp
@@ -10,7 +10,7 @@ SET(sources
 	subd_split.cpp
 	subd_stencil.cpp)
 
-SET(headers
+set(headers
 	subd_build.h
 	subd_dice.h
 	subd_edge.h
@@ -22,5 +22,5 @@ SET(headers
 	subd_stencil.h
 	subd_vert.h)
 
-ADD_LIBRARY(cycles_subd ${sources} ${headers})
+add_library(cycles_subd ${sources} ${headers})
 
diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt
index 380383e3146..4db90adc9e6 100644
--- a/intern/cycles/util/CMakeLists.txt
+++ b/intern/cycles/util/CMakeLists.txt
@@ -1,10 +1,10 @@
 
-INCLUDE_DIRECTORIES(
+include_directories(
 	.
 	${GLEW_INCLUDE_PATH}
 	${OPENGL_INCLUDE_DIR})
 
-SET(sources
+set(sources
 	util_cache.cpp
 	util_cuda.cpp
 	util_dynlib.cpp
@@ -15,11 +15,11 @@ SET(sources
 	util_time.cpp
 	util_transform.cpp)
 
-IF(WITH_CYCLES_TEST)
-	LIST(APPEND sources util_view.cpp)
-ENDIF()
+if(WITH_CYCLES_TEST)
+	list(APPEND sources util_view.cpp)
+endif()
 
-SET(headers
+set(headers
 	util_algorithm.h
 	util_args.h
 	util_boundbox.h
@@ -49,5 +49,5 @@ SET(headers
 	util_vector.h
 	util_xml.h)
 
-ADD_LIBRARY(cycles_util ${sources} ${headers})
+add_library(cycles_util ${sources} ${headers})