use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed.

build_files/cmake/macros.cmake

@@ -1,311 +1,311 @@
 
 # only MSVC uses SOURCE_GROUP
-MACRO(BLENDERLIB_NOLIST
+macro(blenderlib_nolist
 	name
 	sources
 	includes)
 
-	MESSAGE(STATUS "Configuring library ${name}")
+	message(STATUS "Configuring library ${name}")
 
-	INCLUDE_DIRECTORIES(${includes})
+	include_directories(${includes})
-	ADD_LIBRARY(${name} ${sources})
+	add_library(${name} ${sources})
 
 	# Group by location on disk
-	SOURCE_GROUP("Source Files" FILES CMakeLists.txt)
+	source_group("Source Files" FILES CMakeLists.txt)
-	FOREACH(SRC ${sources})
+	foreach(SRC ${sources})
-		GET_FILENAME_COMPONENT(SRC_EXT ${SRC} EXT)
+		get_filename_component(SRC_EXT ${SRC} EXT)
-		IF(${SRC_EXT} MATCHES ".h" OR ${SRC_EXT} MATCHES ".hpp") 
+		if(${SRC_EXT} MATCHES ".h" OR ${SRC_EXT} MATCHES ".hpp") 
-			SOURCE_GROUP("Header Files" FILES ${SRC})
+			source_group("Header Files" FILES ${SRC})
-		ELSE()
+		else()
-			SOURCE_GROUP("Source Files" FILES ${SRC})
+			source_group("Source Files" FILES ${SRC})
-		ENDIF()
+		endif()
-	ENDFOREACH(SRC)
+	endforeach()
-ENDMACRO(BLENDERLIB_NOLIST)
+endmacro()
 
 #	# works fine but having the includes listed is helpful for IDE's (QtCreator/MSVC)
-#	MACRO(BLENDERLIB_NOLIST
+#	macro(blenderlib_nolist
 #		name
 #		sources
 #		includes)
 #
-#		MESSAGE(STATUS "Configuring library ${name}")
+#		message(STATUS "Configuring library ${name}")
-#		INCLUDE_DIRECTORIES(${includes})
+#		include_directories(${includes})
-#		ADD_LIBRARY(${name} ${sources})
+#		add_library(${name} ${sources})
-#	ENDMACRO(BLENDERLIB_NOLIST)
+#	endmacro()
 
 
-MACRO(BLENDERLIB
+macro(blenderlib
 	name
 	sources
 	includes)
 
-	BLENDERLIB_NOLIST(${name} "${sources}" "${includes}")
+	blenderlib_nolist(${name} "${sources}" "${includes}")
 
-	SET_PROPERTY(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name})
+	set_property(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name})
 
-ENDMACRO(BLENDERLIB)
+endmacro()
 
-MACRO(SETUP_LIBDIRS)
+macro(SETUP_LIBDIRS)
 	# see "cmake --help-policy CMP0003"
 	if(COMMAND cmake_policy)
-		CMAKE_POLICY(SET CMP0003 NEW)
+		cmake_policy(SET CMP0003 NEW)
-	endif(COMMAND cmake_policy)
+	endif()
 	
-	LINK_DIRECTORIES(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH})
+	link_directories(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH})
 
-	IF(WITH_PYTHON)
+	if(WITH_PYTHON)
-		LINK_DIRECTORIES(${PYTHON_LIBPATH})
+		link_directories(${PYTHON_LIBPATH})
-	ENDIF(WITH_PYTHON)
+	endif()
-	IF(WITH_INTERNATIONAL)
+	if(WITH_INTERNATIONAL)
-		LINK_DIRECTORIES(${ICONV_LIBPATH})
+		link_directories(${ICONV_LIBPATH})
-		LINK_DIRECTORIES(${GETTEXT_LIBPATH})
+		link_directories(${GETTEXT_LIBPATH})
-	ENDIF(WITH_INTERNATIONAL)
+	endif()
-	IF(WITH_SDL)
+	if(WITH_SDL)
-		LINK_DIRECTORIES(${SDL_LIBPATH})
+		link_directories(${SDL_LIBPATH})
-	ENDIF(WITH_SDL)
+	endif()
-	IF(WITH_CODEC_FFMPEG)
+	if(WITH_CODEC_FFMPEG)
-		LINK_DIRECTORIES(${FFMPEG_LIBPATH})
+		link_directories(${FFMPEG_LIBPATH})
-	ENDIF(WITH_CODEC_FFMPEG)
+	endif()
-	IF(WITH_IMAGE_OPENEXR)
+	if(WITH_IMAGE_OPENEXR)
-		LINK_DIRECTORIES(${OPENEXR_LIBPATH})
+		link_directories(${OPENEXR_LIBPATH})
-	ENDIF(WITH_IMAGE_OPENEXR)
+	endif()
-	IF(WITH_IMAGE_TIFF)
+	if(WITH_IMAGE_TIFF)
-		LINK_DIRECTORIES(${TIFF_LIBPATH})
+		link_directories(${TIFF_LIBPATH})
-	ENDIF(WITH_IMAGE_TIFF)
+	endif()
-	IF(WITH_LCMS)
+	if(WITH_LCMS)
-		LINK_DIRECTORIES(${LCMS_LIBPATH})
+		link_directories(${LCMS_LIBPATH})
-	ENDIF(WITH_LCMS)
+	endif()
-	IF(WITH_CODEC_QUICKTIME)
+	if(WITH_CODEC_QUICKTIME)
-		LINK_DIRECTORIES(${QUICKTIME_LIBPATH})
+		link_directories(${QUICKTIME_LIBPATH})
-	ENDIF(WITH_CODEC_QUICKTIME)
+	endif()
-	IF(WITH_OPENAL)
+	if(WITH_OPENAL)
-		LINK_DIRECTORIES(${OPENAL_LIBPATH})
+		link_directories(${OPENAL_LIBPATH})
-	ENDIF(WITH_OPENAL)
+	endif()
-	IF(WITH_JACK)
+	if(WITH_JACK)
-		LINK_DIRECTORIES(${JACK_LIBPATH})
+		link_directories(${JACK_LIBPATH})
-	ENDIF(WITH_JACK)
+	endif()
-	IF(WITH_CODEC_SNDFILE)
+	if(WITH_CODEC_SNDFILE)
-		LINK_DIRECTORIES(${SNDFILE_LIBPATH})
+		link_directories(${SNDFILE_LIBPATH})
-	ENDIF(WITH_CODEC_SNDFILE)
+	endif()
-	IF(WITH_SAMPLERATE)
+	if(WITH_SAMPLERATE)
-		LINK_DIRECTORIES(${LIBSAMPLERATE_LIBPATH})
+		link_directories(${LIBSAMPLERATE_LIBPATH})
-	ENDIF(WITH_SAMPLERATE)
+	endif()
-	IF(WITH_FFTW3)
+	if(WITH_FFTW3)
-		LINK_DIRECTORIES(${FFTW3_LIBPATH})
+		link_directories(${FFTW3_LIBPATH})
-	ENDIF(WITH_FFTW3)
+	endif()
-	IF(WITH_OPENCOLLADA)
+	if(WITH_OPENCOLLADA)
-		LINK_DIRECTORIES(${OPENCOLLADA_LIBPATH})
+		link_directories(${OPENCOLLADA_LIBPATH})
-		LINK_DIRECTORIES(${PCRE_LIBPATH})
+		link_directories(${PCRE_LIBPATH})
-		LINK_DIRECTORIES(${EXPAT_LIBPATH})
+		link_directories(${EXPAT_LIBPATH})
-	ENDIF(WITH_OPENCOLLADA)
+	endif()
 
-	IF(WIN32 AND NOT UNIX)
+	if(WIN32 AND NOT UNIX)
-		LINK_DIRECTORIES(${PTHREADS_LIBPATH})
+		link_directories(${PTHREADS_LIBPATH})
-	ENDIF(WIN32 AND NOT UNIX)
+	endif()
-ENDMACRO(SETUP_LIBDIRS)
+endmacro()
 
-MACRO(SETUP_LIBLINKS
+macro(setup_liblinks
 	target)
-	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ")
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ")
 
-	TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${LLIBS})
+	target_link_libraries(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${LLIBS})
 
 	# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
-	IF(WITH_PYTHON)
+	if(WITH_PYTHON)
-		TARGET_LINK_LIBRARIES(${target} ${PYTHON_LINKFLAGS})
+		target_link_libraries(${target} ${PYTHON_LINKFLAGS})
 
-		IF(WIN32 AND NOT UNIX)
+		if(WIN32 AND NOT UNIX)
-			TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
+			target_link_libraries(${target} debug ${PYTHON_LIB}_d)
-			TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
+			target_link_libraries(${target} optimized ${PYTHON_LIB})
-		ELSE(WIN32 AND NOT UNIX)
+		else()
-			TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
+			target_link_libraries(${target} ${PYTHON_LIB})
-		ENDIF(WIN32 AND NOT UNIX)
+		endif()
-	ENDIF(WITH_PYTHON)
+	endif()
 
-	TARGET_LINK_LIBRARIES(${target} ${OPENGL_glu_LIBRARY} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB})
+	target_link_libraries(${target} ${OPENGL_glu_LIBRARY} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB})
-	TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIBRARY})
+	target_link_libraries(${target} ${FREETYPE_LIBRARY})
 
-	IF(WITH_INTERNATIONAL)
+	if(WITH_INTERNATIONAL)
-		TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB})
+		target_link_libraries(${target} ${GETTEXT_LIB})
 
-		IF(WIN32 AND NOT UNIX)
+		if(WIN32 AND NOT UNIX)
-			TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB})
+			target_link_libraries(${target} ${ICONV_LIB})
-		ENDIF(WIN32 AND NOT UNIX)
+		endif()
-	ENDIF(WITH_INTERNATIONAL)
+	endif()
 
-	IF(WITH_OPENAL)
+	if(WITH_OPENAL)
-		TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIBRARY})
+		target_link_libraries(${target} ${OPENAL_LIBRARY})
-	ENDIF(WITH_OPENAL)
+	endif()
-	IF(WITH_FFTW3)	
+	if(WITH_FFTW3)	
-		TARGET_LINK_LIBRARIES(${target} ${FFTW3_LIB})
+		target_link_libraries(${target} ${FFTW3_LIB})
-	ENDIF(WITH_FFTW3)
+	endif()
-	IF(WITH_JACK)
+	if(WITH_JACK)
-		TARGET_LINK_LIBRARIES(${target} ${JACK_LIB})
+		target_link_libraries(${target} ${JACK_LIB})
-	ENDIF(WITH_JACK)
+	endif()
-	IF(WITH_CODEC_SNDFILE)
+	if(WITH_CODEC_SNDFILE)
-		TARGET_LINK_LIBRARIES(${target} ${SNDFILE_LIB})
+		target_link_libraries(${target} ${SNDFILE_LIB})
-	ENDIF(WITH_CODEC_SNDFILE)
+	endif()
-	IF(WITH_SAMPLERATE)
+	if(WITH_SAMPLERATE)
-		TARGET_LINK_LIBRARIES(${target} ${LIBSAMPLERATE_LIB})
+		target_link_libraries(${target} ${LIBSAMPLERATE_LIB})
-	ENDIF(WITH_SAMPLERATE)	
+	endif()	
-	IF(WITH_SDL)
+	if(WITH_SDL)
-		TARGET_LINK_LIBRARIES(${target} ${SDL_LIBRARY})
+		target_link_libraries(${target} ${SDL_LIBRARY})
-	ENDIF(WITH_SDL)
+	endif()
-	IF(WITH_CODEC_QUICKTIME)
+	if(WITH_CODEC_QUICKTIME)
-		TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB})
+		target_link_libraries(${target} ${QUICKTIME_LIB})
-	ENDIF(WITH_CODEC_QUICKTIME)
+	endif()
-	IF(WITH_IMAGE_TIFF)
+	if(WITH_IMAGE_TIFF)
-		TARGET_LINK_LIBRARIES(${target} ${TIFF_LIBRARY})
+		target_link_libraries(${target} ${TIFF_LIBRARY})
-	ENDIF(WITH_IMAGE_TIFF)
+	endif()
-	IF(WITH_IMAGE_OPENEXR)
+	if(WITH_IMAGE_OPENEXR)
-		IF(WIN32 AND NOT UNIX)
+		if(WIN32 AND NOT UNIX)
-			FOREACH(loop_var ${OPENEXR_LIB})
+			foreach(loop_var ${OPENEXR_LIB})
-				TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d)
+				target_link_libraries(${target} debug ${loop_var}_d)
-				TARGET_LINK_LIBRARIES(${target} optimized ${loop_var})
+				target_link_libraries(${target} optimized ${loop_var})
-			ENDFOREACH(loop_var)
+			endforeach()
-		ELSE(WIN32 AND NOT UNIX)
+		else()
-			TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB})
+			target_link_libraries(${target} ${OPENEXR_LIB})
-		ENDIF(WIN32 AND NOT UNIX)
+		endif()
-	ENDIF(WITH_IMAGE_OPENEXR)
+	endif()
-	IF(WITH_LCMS)
+	if(WITH_LCMS)
-		TARGET_LINK_LIBRARIES(${target} ${LCMS_LIBRARY})
+		target_link_libraries(${target} ${LCMS_LIBRARY})
-	ENDIF(WITH_LCMS)
+	endif()
-	IF(WITH_CODEC_FFMPEG)
+	if(WITH_CODEC_FFMPEG)
-		TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB})
+		target_link_libraries(${target} ${FFMPEG_LIB})
-	ENDIF(WITH_CODEC_FFMPEG)
+	endif()
-	IF(WITH_OPENCOLLADA)
+	if(WITH_OPENCOLLADA)
-		IF(WIN32 AND NOT UNIX)
+		if(WIN32 AND NOT UNIX)
-			FOREACH(loop_var ${OPENCOLLADA_LIB})
+			foreach(loop_var ${OPENCOLLADA_LIB})
-				TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d)
+				target_link_libraries(${target} debug ${loop_var}_d)
-				TARGET_LINK_LIBRARIES(${target} optimized ${loop_var})
+				target_link_libraries(${target} optimized ${loop_var})
-			ENDFOREACH(loop_var)
+			endforeach()
-			TARGET_LINK_LIBRARIES(${target} debug ${PCRE_LIB}_d)
+			target_link_libraries(${target} debug ${PCRE_LIB}_d)
-			TARGET_LINK_LIBRARIES(${target} optimized ${PCRE_LIB})
+			target_link_libraries(${target} optimized ${PCRE_LIB})
-			IF(EXPAT_LIB)
+			if(EXPAT_LIB)
-				TARGET_LINK_LIBRARIES(${target} debug ${EXPAT_LIB}_d)
+				target_link_libraries(${target} debug ${EXPAT_LIB}_d)
-				TARGET_LINK_LIBRARIES(${target} optimized ${EXPAT_LIB})
+				target_link_libraries(${target} optimized ${EXPAT_LIB})
-			ENDIF(EXPAT_LIB)
+			endif()
-		ELSE(WIN32 AND NOT UNIX)
+		else()
-			TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
+			target_link_libraries(${target} ${OPENCOLLADA_LIB})
-			TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB})
+			target_link_libraries(${target} ${PCRE_LIB})
-			TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB})
+			target_link_libraries(${target} ${EXPAT_LIB})
-		ENDIF(WIN32 AND NOT UNIX)
+		endif()
-	ENDIF(WITH_OPENCOLLADA)
+	endif()
-	IF(WITH_LCMS)
+	if(WITH_LCMS)
-		IF(WIN32 AND NOT UNIX)
+		if(WIN32 AND NOT UNIX)
-			TARGET_LINK_LIBRARIES(${target} debug ${LCMS_LIB}_d)
+			target_link_libraries(${target} debug ${LCMS_LIB}_d)
-			TARGET_LINK_LIBRARIES(${target} optimized ${LCMS_LIB})
+			target_link_libraries(${target} optimized ${LCMS_LIB})
-		ENDIF(WIN32 AND NOT UNIX)
+		endif()
-	ENDIF(WITH_LCMS)
+	endif()
-	IF(WIN32 AND NOT UNIX)
+	if(WIN32 AND NOT UNIX)
-		TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
+		target_link_libraries(${target} ${PTHREADS_LIB})
-	ENDIF(WIN32 AND NOT UNIX)
+	endif()
-ENDMACRO(SETUP_LIBLINKS)
+endmacro()
 
-MACRO(TEST_SSE_SUPPORT)
+macro(TEST_SSE_SUPPORT)
-	INCLUDE(CheckCSourceRuns)
+	include(CheckCSourceRuns)
 
-	MESSAGE(STATUS "Detecting SSE support")
+	message(STATUS "Detecting SSE support")
-	IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+	if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-		SET(CMAKE_REQUIRED_FLAGS "-msse -msse2")
+		set(CMAKE_REQUIRED_FLAGS "-msse -msse2")
-	ELSEIF(MSVC)
+	elseif(MSVC)
-		SET(CMAKE_REQUIRED_FLAGS "/arch:SSE2") # TODO, SSE 1 ?
+		set(CMAKE_REQUIRED_FLAGS "/arch:SSE2") # TODO, SSE 1 ?
-	ENDIF()
+	endif()
 
-	CHECK_C_SOURCE_RUNS("
+	check_c_source_runs("
 		#include <xmmintrin.h>
 		int main() { __m128 v = _mm_setzero_ps(); return 0; }"
 	SUPPORT_SSE_BUILD)
 
-	CHECK_C_SOURCE_RUNS("
+	check_c_source_runs("
 		#include <emmintrin.h>
 		int main() { __m128d v = _mm_setzero_pd(); return 0; }"
 	SUPPORT_SSE2_BUILD)
-	MESSAGE(STATUS "Detecting SSE support")
+	message(STATUS "Detecting SSE support")
 
-	IF(SUPPORT_SSE_BUILD)
+	if(SUPPORT_SSE_BUILD)
-		MESSAGE(STATUS "   ...SSE support found.")
+		message(STATUS "   ...SSE support found.")
-	ELSE(SUPPORT_SSE_BUILD)
+	else()
-		MESSAGE(STATUS "   ...SSE support missing.")
+		message(STATUS "   ...SSE support missing.")
-	ENDIF(SUPPORT_SSE_BUILD)
+	endif()
 
-	IF(SUPPORT_SSE2_BUILD)
+	if(SUPPORT_SSE2_BUILD)
-		MESSAGE(STATUS "   ...SSE2 support found.")
+		message(STATUS "   ...SSE2 support found.")
-	ELSE(SUPPORT_SSE2_BUILD)
+	else()
-		MESSAGE(STATUS "   ...SSE2 support missing.")
+		message(STATUS "   ...SSE2 support missing.")
-	ENDIF(SUPPORT_SSE2_BUILD)
+	endif()
 
-ENDMACRO(TEST_SSE_SUPPORT)
+endmacro()
 
 # when we have warnings as errors applied globally this
 # needs to be removed for some external libs which we dont maintain.
 
 # utility macro
-MACRO(_REMOVE_STRICT_FLAGS
+macro(_remove_strict_flags
 	flag)
 	
-	STRING(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+	string(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-	STRING(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+	string(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
-	STRING(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+	string(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
-	STRING(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL}")
+	string(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL}")
-	STRING(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+	string(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
 
-	STRING(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+	string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-	STRING(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+	string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
-	STRING(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+	string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-	STRING(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}")
+	string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}")
-	STRING(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+	string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
 
-ENDMACRO(_REMOVE_STRICT_FLAGS)
+endmacro()
 
-MACRO(REMOVE_STRICT_FLAGS)
+macro(remove_strict_flags)
 
-	IF(CMAKE_COMPILER_IS_GNUCC)
+	if(CMAKE_COMPILER_IS_GNUCC)
-		_REMOVE_STRICT_FLAGS("-Wstrict-prototypes")
+		_remove_strict_flags("-Wstrict-prototypes")
-		_REMOVE_STRICT_FLAGS("-Wunused-parameter")
+		_remove_strict_flags("-Wunused-parameter")
-		_REMOVE_STRICT_FLAGS("-Wwrite-strings")
+		_remove_strict_flags("-Wwrite-strings")
-		_REMOVE_STRICT_FLAGS("-Wshadow")
+		_remove_strict_flags("-Wshadow")
-		_REMOVE_STRICT_FLAGS("-Werror=[^ ]+")
+		_remove_strict_flags("-Werror=[^ ]+")
-		_REMOVE_STRICT_FLAGS("-Werror")
+		_remove_strict_flags("-Werror")
-	ENDIF(CMAKE_COMPILER_IS_GNUCC)
+	endif()
 
-	IF(MSVC)
+	if(MSVC)
 		# TODO
-	ENDIF(MSVC)
+	endif()
 
-ENDMACRO(REMOVE_STRICT_FLAGS)
+endmacro()
 
 
-MACRO(GET_BLENDER_VERSION)
+macro(get_blender_version)
-	FILE(READ ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h CONTENT)
+	file(READ ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h CONTENT)
-	STRING(REGEX REPLACE "\n" ";" CONTENT "${CONTENT}")
+	string(REGEX REPLACE "\n" ";" CONTENT "${CONTENT}")
-	STRING(REGEX REPLACE "\t" ";" CONTENT "${CONTENT}")
+	string(REGEX REPLACE "\t" ";" CONTENT "${CONTENT}")
-	STRING(REGEX REPLACE " " ";" CONTENT "${CONTENT}")
+	string(REGEX REPLACE " " ";" CONTENT "${CONTENT}")
 
-	FOREACH(ITEM ${CONTENT})
+	foreach(ITEM ${CONTENT})
-		IF(LASTITEM MATCHES "BLENDER_VERSION")
+		if(LASTITEM MATCHES "BLENDER_VERSION")
 			MATH(EXPR BLENDER_VERSION_MAJOR "${ITEM} / 100")
 			MATH(EXPR BLENDER_VERSION_MINOR "${ITEM} % 100")
-			SET(BLENDER_VERSION "${BLENDER_VERSION_MAJOR}.${BLENDER_VERSION_MINOR}")
+			set(BLENDER_VERSION "${BLENDER_VERSION_MAJOR}.${BLENDER_VERSION_MINOR}")
-		ENDIF(LASTITEM MATCHES "BLENDER_VERSION")
+		endif()
 		
-		IF(LASTITEM MATCHES "BLENDER_SUBVERSION")
+		if(LASTITEM MATCHES "BLENDER_SUBVERSION")
-			SET(BLENDER_SUBVERSION ${ITEM})
+			set(BLENDER_SUBVERSION ${ITEM})
-		ENDIF(LASTITEM MATCHES "BLENDER_SUBVERSION")
+		endif()
 		
-		IF(LASTITEM MATCHES "BLENDER_MINVERSION")
+		if(LASTITEM MATCHES "BLENDER_MINVERSION")
 			MATH(EXPR BLENDER_MINVERSION_MAJOR "${ITEM} / 100")
 			MATH(EXPR BLENDER_MINVERSION_MINOR "${ITEM} % 100")
-			SET(BLENDER_MINVERSION "${BLENDER_MINVERSION_MAJOR}.${BLENDER_MINVERSION_MINOR}")
+			set(BLENDER_MINVERSION "${BLENDER_MINVERSION_MAJOR}.${BLENDER_MINVERSION_MINOR}")
-		ENDIF(LASTITEM MATCHES "BLENDER_MINVERSION")
+		endif()
 		
-		IF(LASTITEM MATCHES "BLENDER_MINSUBVERSION")
+		if(LASTITEM MATCHES "BLENDER_MINSUBVERSION")
-			SET(BLENDER_MINSUBVERSION ${ITEM})
+			set(BLENDER_MINSUBVERSION ${ITEM})
-		ENDIF(LASTITEM MATCHES "BLENDER_MINSUBVERSION")
+		endif()
 
-		SET(LASTITEM ${ITEM})
+		set(LASTITEM ${ITEM})
-	ENDFOREACH(ITEM ${CONTENT})
+	endforeach()
 	
-	MESSAGE(STATUS "Version major: ${BLENDER_VERSION_MAJOR}, Version minor: ${BLENDER_VERSION_MINOR}, Subversion: ${BLENDER_SUBVERSION}, Version: ${BLENDER_VERSION}")
+	message(STATUS "Version major: ${BLENDER_VERSION_MAJOR}, Version minor: ${BLENDER_VERSION_MINOR}, Subversion: ${BLENDER_SUBVERSION}, Version: ${BLENDER_VERSION}")
-	MESSAGE(STATUS "Minversion major: ${BLENDER_MINVERSION_MAJOR}, Minversion minor: ${BLENDER_MINVERSION_MINOR}, MinSubversion: ${BLENDER_MINSUBVERSION}, Minversion: ${BLENDER_MINVERSION}")
+	message(STATUS "Minversion major: ${BLENDER_MINVERSION_MAJOR}, Minversion minor: ${BLENDER_MINVERSION_MINOR}, MinSubversion: ${BLENDER_MINSUBVERSION}, Minversion: ${BLENDER_MINVERSION}")
-ENDMACRO(GET_BLENDER_VERSION)
+endmacro()

extern/CMakeLists.txt

@@ -25,30 +25,30 @@
 # ***** END GPL LICENSE BLOCK *****
 
 # Otherwise we get warnings here that we cant fix in external projects
-REMOVE_STRICT_FLAGS()
+remove_strict_flags()
 
-IF(WITH_BULLET)
+if(WITH_BULLET)
-	ADD_SUBDIRECTORY(bullet2)
+	add_subdirectory(bullet2)
-ENDIF(WITH_BULLET)
+endif()
 
-IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-	ADD_SUBDIRECTORY(binreloc)
+	add_subdirectory(binreloc)
-ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+endif()
 
-ADD_SUBDIRECTORY(glew)
+add_subdirectory(glew)
 
-IF(WITH_IMAGE_OPENJPEG)
+if(WITH_IMAGE_OPENJPEG)
-	ADD_SUBDIRECTORY(libopenjpeg)
+	add_subdirectory(libopenjpeg)
-ENDIF(WITH_IMAGE_OPENJPEG)
+endif()
 
-IF(WITH_IMAGE_REDCODE)
+if(WITH_IMAGE_REDCODE)
-	ADD_SUBDIRECTORY(libredcode)
+	add_subdirectory(libredcode)
-ENDIF(WITH_IMAGE_REDCODE)
+endif()
 
-IF(WITH_LZO)
+if(WITH_LZO)
-	ADD_SUBDIRECTORY(lzo)
+	add_subdirectory(lzo)
-ENDIF(WITH_LZO)
+endif()
 
-IF(WITH_LZMA)
+if(WITH_LZMA)
-	ADD_SUBDIRECTORY(lzma)
+	add_subdirectory(lzma)
-ENDIF(WITH_LZMA)
+endif()

extern/binreloc/CMakeLists.txt

@@ -18,17 +18,17 @@
 # All rights reserved.
 #
 
-SET(SRC
+set(SRC
 	binreloc.c
 
 	include/binreloc.h
 )
 
-SET(INC
+set(INC
 	./include
 )
 
-ADD_DEFINITIONS(-DENABLE_BINRELOC)
+add_definitions(-DENABLE_BINRELOC)
 
 
-BLENDERLIB(extern_binreloc "${SRC}" "${INC}")
+blenderlib(extern_binreloc "${SRC}" "${INC}")

extern/bullet2/CMakeLists.txt

@@ -24,12 +24,12 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	.
 	src
 )
 
-SET(SRC
+set(SRC
 	src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
 	src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp
 	src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp
@@ -319,4 +319,4 @@ SET(SRC
 	src/btBulletDynamicsCommon.h
 )
 
-BLENDERLIB(extern_bullet "${SRC}" "${INC}")
+blenderlib(extern_bullet "${SRC}" "${INC}")

extern/bullet2/src/BulletCollision/CMakeLists.txt

@@ -1,6 +1,6 @@
-INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src } )
+include_directories( ${BULLET_PHYSICS_SOURCE_DIR}/src } )
 
-SET(BulletCollision_SRCS
+set(BulletCollision_SRCS
 	BroadphaseCollision/btAxisSweep3.cpp
 	BroadphaseCollision/btBroadphaseProxy.cpp
 	BroadphaseCollision/btCollisionAlgorithm.cpp
@@ -88,10 +88,10 @@ SET(BulletCollision_SRCS
 	NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
 )
 
-SET(Root_HDRS
+set(Root_HDRS
 	../btBulletCollisionCommon.h
 )
-SET(BroadphaseCollision_HDRS
+set(BroadphaseCollision_HDRS
 	BroadphaseCollision/btAxisSweep3.h
 	BroadphaseCollision/btBroadphaseInterface.h
 	BroadphaseCollision/btBroadphaseProxy.h
@@ -105,7 +105,7 @@ SET(BroadphaseCollision_HDRS
 	BroadphaseCollision/btQuantizedBvh.h
 	BroadphaseCollision/btSimpleBroadphase.h
 )
-SET(CollisionDispatch_HDRS
+set(CollisionDispatch_HDRS
 	CollisionDispatch/btActivatingCollisionAlgorithm.h
 	CollisionDispatch/btCollisionConfiguration.h
 	CollisionDispatch/btCollisionCreateFunc.h
@@ -129,7 +129,7 @@ SET(CollisionDispatch_HDRS
 	CollisionDispatch/btUnionFind.h
 	CollisionDispatch/SphereTriangleDetector.h
 )
-SET(CollisionShapes_HDRS
+set(CollisionShapes_HDRS
 	CollisionShapes/btBoxShape.h
 	CollisionShapes/btBvhTriangleMeshShape.h
 	CollisionShapes/btCapsuleShape.h
@@ -166,7 +166,7 @@ SET(CollisionShapes_HDRS
 	CollisionShapes/btTriangleMeshShape.h
 	CollisionShapes/btUniformScalingShape.h
 )
-SET(Gimpact_HDRS
+set(Gimpact_HDRS
 	Gimpact/btGImpactShape.h
 	Gimpact/gim_contact.h
 	Gimpact/btGImpactBvh.h
@@ -178,7 +178,7 @@ SET(Gimpact_HDRS
 	Gimpact/btGImpactQuantizedBvh.h
 	Gimpact/gim_box_set.h
 )
-SET(NarrowPhaseCollision_HDRS
+set(NarrowPhaseCollision_HDRS
 	NarrowPhaseCollision/btContinuousConvexCollision.h
 	NarrowPhaseCollision/btConvexCast.h
 	NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
@@ -197,7 +197,7 @@ SET(NarrowPhaseCollision_HDRS
 	NarrowPhaseCollision/btVoronoiSimplexSolver.h
 )
 
-SET(BulletCollision_HDRS
+set(BulletCollision_HDRS
 	${Root_HDRS}
 	${BroadphaseCollision_HDRS}
 	${CollisionDispatch_HDRS}
@@ -207,28 +207,28 @@ SET(BulletCollision_HDRS
 )
 
 
-ADD_LIBRARY(BulletCollision ${BulletCollision_SRCS} ${BulletCollision_HDRS})
+add_library(BulletCollision ${BulletCollision_SRCS} ${BulletCollision_HDRS})
 SET_TARGET_PROPERTIES(BulletCollision PROPERTIES VERSION ${BULLET_VERSION})
 SET_TARGET_PROPERTIES(BulletCollision PROPERTIES SOVERSION ${BULLET_VERSION})
-IF (BUILD_SHARED_LIBS)
+if(BUILD_SHARED_LIBS)
-	TARGET_LINK_LIBRARIES(BulletCollision LinearMath)
+	target_link_libraries(BulletCollision LinearMath)
-ENDIF (BUILD_SHARED_LIBS)
+endif()
 
 #INSTALL of other files requires CMake 2.6
-IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
-	INSTALL(TARGETS BulletCollision DESTINATION lib)
+	install(TARGETS BulletCollision DESTINATION lib)
-				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+				install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
-ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+endif()
 
-IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+if(APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 	SET_TARGET_PROPERTIES(BulletCollision PROPERTIES FRAMEWORK true)
 
 	SET_TARGET_PROPERTIES(BulletCollision PROPERTIES PUBLIC_HEADER "${Root_HDRS}")
 	# Have to list out sub-directories manually:
-	SET_PROPERTY(SOURCE ${BroadphaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadphaseCollision)
+	set_property(SOURCE ${BroadphaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadphaseCollision)
-	SET_PROPERTY(SOURCE ${CollisionDispatch_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/CollisionDispatch)
+	set_property(SOURCE ${CollisionDispatch_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/CollisionDispatch)
-	SET_PROPERTY(SOURCE ${CollisionShapes_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/CollisionShapes)
+	set_property(SOURCE ${CollisionShapes_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/CollisionShapes)
-	SET_PROPERTY(SOURCE ${Gimpact_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Gimpact)
+	set_property(SOURCE ${Gimpact_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Gimpact)
-	SET_PROPERTY(SOURCE ${NarrowPhaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/NarrowPhaseCollision)
+	set_property(SOURCE ${NarrowPhaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/NarrowPhaseCollision)
 
-ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+endif()

extern/bullet2/src/BulletDynamics/CMakeLists.txt

@@ -1,6 +1,6 @@
-INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src } )
+include_directories( ${BULLET_PHYSICS_SOURCE_DIR}/src } )
 
-SET(BulletDynamics_SRCS
+set(BulletDynamics_SRCS
 	ConstraintSolver/btContactConstraint.cpp
 	ConstraintSolver/btConeTwistConstraint.cpp
 	ConstraintSolver/btGeneric6DofConstraint.cpp
@@ -19,11 +19,11 @@ SET(BulletDynamics_SRCS
 	Character/btKinematicCharacterController.cpp
 )
 
-SET(Root_HDRS
+set(Root_HDRS
 	../btBulletDynamicsCommon.h
 	../btBulletCollisionCommon.h
 )
-SET(ConstraintSolver_HDRS
+set(ConstraintSolver_HDRS
 	ConstraintSolver/btConstraintSolver.h
 	ConstraintSolver/btContactConstraint.h
 	ConstraintSolver/btContactSolverInfo.h
@@ -39,27 +39,27 @@ SET(ConstraintSolver_HDRS
 	ConstraintSolver/btSolverConstraint.h
 	ConstraintSolver/btTypedConstraint.h
 )
-SET(Dynamics_HDRS
+set(Dynamics_HDRS
 	Dynamics/btContinuousDynamicsWorld.h
 	Dynamics/btDiscreteDynamicsWorld.h
 	Dynamics/btDynamicsWorld.h
 	Dynamics/btSimpleDynamicsWorld.h
 	Dynamics/btRigidBody.h
 )
-SET(Vehicle_HDRS
+set(Vehicle_HDRS
 	Vehicle/btRaycastVehicle.h
 	Vehicle/btVehicleRaycaster.h
 	Vehicle/btWheelInfo.h
 )
 
-SET(Character_HDRS
+set(Character_HDRS
 	Character/btCharacterControllerInterface.h
 	Character/btKinematicCharacterController.h
 )
 
 
 
-SET(BulletDynamics_HDRS
+set(BulletDynamics_HDRS
 	${Root_HDRS}
 	${ConstraintSolver_HDRS}
 	${Dynamics_HDRS}
@@ -68,26 +68,26 @@ SET(BulletDynamics_HDRS
 )
 
 
-ADD_LIBRARY(BulletDynamics ${BulletDynamics_SRCS} ${BulletDynamics_HDRS})
+add_library(BulletDynamics ${BulletDynamics_SRCS} ${BulletDynamics_HDRS})
 SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES VERSION ${BULLET_VERSION})
 SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES SOVERSION ${BULLET_VERSION})
-IF (BUILD_SHARED_LIBS)
+if(BUILD_SHARED_LIBS)
-	TARGET_LINK_LIBRARIES(BulletDynamics BulletCollision LinearMath)
+	target_link_libraries(BulletDynamics BulletCollision LinearMath)
-ENDIF (BUILD_SHARED_LIBS)
+endif()
 
-IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
-	INSTALL(TARGETS BulletDynamics DESTINATION lib)
+	install(TARGETS BulletDynamics DESTINATION lib)
-	INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+	install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
-ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+endif()
 
-IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+if(APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 	SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES FRAMEWORK true)
 	
 	SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES PUBLIC_HEADER "${Root_HDRS}")
 	# Have to list out sub-directories manually:
-	SET_PROPERTY(SOURCE ${ConstraintSolver_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/ConstraintSolver)
+	set_property(SOURCE ${ConstraintSolver_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/ConstraintSolver)
-	SET_PROPERTY(SOURCE ${Dynamics_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Dynamics)
+	set_property(SOURCE ${Dynamics_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Dynamics)
-	SET_PROPERTY(SOURCE ${Vehicle_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Vehicle)
+	set_property(SOURCE ${Vehicle_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Vehicle)
-	SET_PROPERTY(SOURCE ${Character_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Character)
+	set_property(SOURCE ${Character_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Character)
 		
-ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+endif()

extern/bullet2/src/BulletSoftBody/CMakeLists.txt

@@ -1,9 +1,9 @@
 
-INCLUDE_DIRECTORIES(
+include_directories(
 ${BULLET_PHYSICS_SOURCE_DIR}/src }
 )
 
-SET(BulletSoftBody_SRCS
+set(BulletSoftBody_SRCS
 	btSoftBody.cpp
 	btSoftBodyHelpers.cpp
 	btSoftBodyRigidBodyCollisionConfiguration.cpp
@@ -13,7 +13,7 @@ SET(BulletSoftBody_SRCS
 	btSoftRigidDynamicsWorld.cpp
 )
 
-SET(BulletSoftBody_HDRS
+set(BulletSoftBody_HDRS
 	btSoftBody.h
 	btSparseSDF.h
 	btSoftBodyHelpers.h
@@ -25,19 +25,19 @@ SET(BulletSoftBody_HDRS
 
 
 
-ADD_LIBRARY(BulletSoftBody  ${BulletSoftBody_SRCS} ${BulletSoftBody_HDRS})
+add_library(BulletSoftBody  ${BulletSoftBody_SRCS} ${BulletSoftBody_HDRS})
 SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES VERSION ${BULLET_VERSION})
 SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES SOVERSION ${BULLET_VERSION})
-IF (BUILD_SHARED_LIBS)
+if(BUILD_SHARED_LIBS)
-	TARGET_LINK_LIBRARIES(BulletSoftBody BulletDynamics)
+	target_link_libraries(BulletSoftBody BulletDynamics)
-ENDIF (BUILD_SHARED_LIBS)
+endif()
 
-IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
-	INSTALL(TARGETS BulletSoftBody DESTINATION lib)
+	install(TARGETS BulletSoftBody DESTINATION lib)
-				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+				install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
-ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+endif()
 
-IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+if(APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 	SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES FRAMEWORK true)
 	SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES PUBLIC_HEADER "${BulletSoftBody_HDRS}")
-ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+endif()

extern/bullet2/src/CMakeLists.txt

@@ -1,4 +1,4 @@
-ADD_SUBDIRECTORY(BulletCollision)
+add_subdirectory(BulletCollision)
-ADD_SUBDIRECTORY(BulletDynamics)
+add_subdirectory(BulletDynamics)
-ADD_SUBDIRECTORY(LinearMath)
+add_subdirectory(LinearMath)
-ADD_SUBDIRECTORY(BulletSoftBody )
+add_subdirectory(BulletSoftBody )

extern/bullet2/src/LinearMath/CMakeLists.txt

@@ -1,16 +1,16 @@
 
-INCLUDE_DIRECTORIES(
+include_directories(
 ${BULLET_PHYSICS_SOURCE_DIR}/src }
 )
 
-SET(LinearMath_SRCS
+set(LinearMath_SRCS
 		btConvexHull.cpp
 		btQuickprof.cpp
 		btGeometryUtil.cpp
 		btAlignedAllocator.cpp
 )
 
-SET(LinearMath_HDRS
+set(LinearMath_HDRS
 		btAlignedObjectArray.h
 		btList.h
 		btPoolAllocator.h
@@ -35,17 +35,17 @@ SET(LinearMath_HDRS
 		btTransformUtil.h
 )
 
-ADD_LIBRARY(LinearMath ${LinearMath_SRCS} ${LinearMath_HDRS})
+add_library(LinearMath ${LinearMath_SRCS} ${LinearMath_HDRS})
 SET_TARGET_PROPERTIES(LinearMath PROPERTIES VERSION ${BULLET_VERSION})
 SET_TARGET_PROPERTIES(LinearMath PROPERTIES SOVERSION ${BULLET_VERSION})
 
 #FILES_MATCHING requires CMake 2.6
-IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
-	INSTALL(TARGETS LinearMath DESTINATION lib)
+	install(TARGETS LinearMath DESTINATION lib)
-	INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+	install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
-ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+endif()
 
-IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+if(APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 	SET_TARGET_PROPERTIES(LinearMath PROPERTIES FRAMEWORK true)
 	SET_TARGET_PROPERTIES(LinearMath PROPERTIES PUBLIC_HEADER "${LinearMath_HDRS}")
-ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+endif()

extern/glew/CMakeLists.txt

@@ -24,15 +24,15 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	./include
 )
 
-IF(UNIX)
+if(UNIX)
-	LIST(APPEND INC ${X11_X11_INCLUDE_PATH})
+	list(APPEND INC ${X11_X11_INCLUDE_PATH})
-ENDIF(UNIX)
+endif()
 
-SET(SRC
+set(SRC
 	src/glew.c
 
 	include/GL/glew.h
@@ -40,6 +40,6 @@ SET(SRC
 	include/GL/wglew.h
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
+add_definitions(-DGLEW_STATIC)
 
-BLENDERLIB(extern_glew "${SRC}" "${INC}")
+blenderlib(extern_glew "${SRC}" "${INC}")

extern/libopenjpeg/CMakeLists.txt

@@ -24,11 +24,11 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	.
 )
 
-SET(SRC
+set(SRC
 	bio.c
 	cio.c
 	dwt.c
@@ -73,4 +73,4 @@ SET(SRC
 	tgt.h
 )
 
-BLENDERLIB(extern_openjpeg "${SRC}" "${INC}")
+blenderlib(extern_openjpeg "${SRC}" "${INC}")

extern/libredcode/CMakeLists.txt

@@ -24,12 +24,12 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	.
 	../libopenjpeg
 )
 
-SET(SRC
+set(SRC
 	codec.c
 	debayer.c
 	format.c
@@ -39,4 +39,4 @@ SET(SRC
 	format.h
 )
 
-BLENDERLIB(extern_redcode "${SRC}" "${INC}")
+blenderlib(extern_redcode "${SRC}" "${INC}")

extern/lzma/CMakeLists.txt

@@ -24,11 +24,11 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	.
 )
 
-SET(SRC
+set(SRC
 	Alloc.c
 	LzFind.c
 	LzmaDec.c
@@ -44,4 +44,4 @@ SET(SRC
 	Types.h
 )
 
-BLENDERLIB(extern_lzma "${SRC}" "${INC}")
+blenderlib(extern_lzma "${SRC}" "${INC}")

extern/lzo/CMakeLists.txt

@@ -24,11 +24,11 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	include
 )
 
-SET(SRC
+set(SRC
 	minilzo/minilzo.c
 
 	minilzo/lzoconf.h
@@ -36,4 +36,4 @@ SET(SRC
 	minilzo/minilzo.h
 )
 
-BLENDERLIB(extern_minilzo "${SRC}" "${INC}")
+blenderlib(extern_minilzo "${SRC}" "${INC}")

intern/CMakeLists.txt

@@ -24,30 +24,30 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-ADD_SUBDIRECTORY(audaspace)
+add_subdirectory(audaspace)
-ADD_SUBDIRECTORY(string)
+add_subdirectory(string)
-ADD_SUBDIRECTORY(ghost)
+add_subdirectory(ghost)
-ADD_SUBDIRECTORY(guardedalloc)
+add_subdirectory(guardedalloc)
-ADD_SUBDIRECTORY(moto)
+add_subdirectory(moto)
-ADD_SUBDIRECTORY(memutil)
+add_subdirectory(memutil)
-ADD_SUBDIRECTORY(iksolver)
+add_subdirectory(iksolver)
-ADD_SUBDIRECTORY(opennl)
+add_subdirectory(opennl)
-ADD_SUBDIRECTORY(smoke)
+add_subdirectory(smoke)
 
-IF(WITH_MOD_FLUID)
+if(WITH_MOD_FLUID)
-	ADD_SUBDIRECTORY(elbeem)
+	add_subdirectory(elbeem)
-ENDIF(WITH_MOD_FLUID)
+endif()
 
-IF(WITH_MOD_DECIMATE)
+if(WITH_MOD_DECIMATE)
-	ADD_SUBDIRECTORY(container)
+	add_subdirectory(container)
-	ADD_SUBDIRECTORY(decimation)
+	add_subdirectory(decimation)
-ENDIF(WITH_MOD_DECIMATE)
+endif()
 
-IF(WITH_MOD_BOOLEAN)
+if(WITH_MOD_BOOLEAN)
-	ADD_SUBDIRECTORY(boolop)
+	add_subdirectory(boolop)
-	ADD_SUBDIRECTORY(bsp)
+	add_subdirectory(bsp)
-ENDIF(WITH_MOD_BOOLEAN)
+endif()
 
-IF(WITH_IK_ITASC)
+if(WITH_IK_ITASC)
-	ADD_SUBDIRECTORY(itasc)
+	add_subdirectory(itasc)
-ENDIF(WITH_IK_ITASC)
+endif()

intern/audaspace/CMakeLists.txt

@@ -20,7 +20,7 @@
 #
 # ***** END LGPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	.
 	intern
 	FX SRC
@@ -28,7 +28,7 @@ SET(INC
 	${LIBSAMPLERATE_INC}
 )
 
-SET(SRC
+set(SRC
 	FX/AUD_AccumulatorFactory.cpp
 	FX/AUD_BaseIIRFilterReader.cpp
 	FX/AUD_ButterworthFactory.cpp
@@ -153,94 +153,94 @@ SET(SRC
 	FX/AUD_VolumeFactory.h
 )
 
-IF(WITH_CODEC_FFMPEG)
+if(WITH_CODEC_FFMPEG)
-	ADD_DEFINITIONS(-DWITH_FFMPEG)
+	add_definitions(-DWITH_FFMPEG)
-	LIST(APPEND INC ffmpeg ${FFMPEG_INC})
+	list(APPEND INC ffmpeg ${FFMPEG_INC})
-	SET(FFMPEGSRC
+	set(FFMPEGSRC
 		ffmpeg/AUD_FFMPEGFactory.cpp
 		ffmpeg/AUD_FFMPEGReader.cpp
 
 		ffmpeg/AUD_FFMPEGFactory.h
 		ffmpeg/AUD_FFMPEGReader.h
 	)
-ENDIF(WITH_CODEC_FFMPEG)
+endif()
 
-IF(WITH_SDL)
+if(WITH_SDL)
-	ADD_DEFINITIONS(-DWITH_SDL)
+	add_definitions(-DWITH_SDL)
-	LIST(APPEND INC SDL ${SDL_INCLUDE_DIR})
+	list(APPEND INC SDL ${SDL_INCLUDE_DIR})
-	SET(SDLSRC
+	set(SDLSRC
 		SDL/AUD_SDLDevice.cpp
 
 		SDL/AUD_SDLDevice.h
 	)
-ENDIF(WITH_SDL)
+endif()
 
-IF(WITH_OPENAL)
+if(WITH_OPENAL)
-	ADD_DEFINITIONS(-DWITH_OPENAL)
+	add_definitions(-DWITH_OPENAL)
-	LIST(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR})
+	list(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR})
-	SET(OPENALSRC
+	set(OPENALSRC
 		OpenAL/AUD_OpenALDevice.cpp
 
 		OpenAL/AUD_OpenALDevice.h
 	)	
-ENDIF(WITH_OPENAL)
+endif()
 
-IF(WITH_JACK)
+if(WITH_JACK)
-	ADD_DEFINITIONS(-DWITH_JACK)
+	add_definitions(-DWITH_JACK)
-	LIST(APPEND INC jack ${JACK_INC})
+	list(APPEND INC jack ${JACK_INC})
-	SET(JACKSRC
+	set(JACKSRC
 		jack/AUD_JackDevice.cpp
 
 		jack/AUD_JackDevice.h
 	)	
-ENDIF(WITH_JACK)
+endif()
 
-IF(WITH_CODEC_SNDFILE)
+if(WITH_CODEC_SNDFILE)
-	ADD_DEFINITIONS(-DWITH_SNDFILE)
+	add_definitions(-DWITH_SNDFILE)
-	LIST(APPEND INC sndfile ${SNDFILE_INC})
+	list(APPEND INC sndfile ${SNDFILE_INC})
-	SET(SNDFILESRC
+	set(SNDFILESRC
 		sndfile/AUD_SndFileFactory.cpp
 		sndfile/AUD_SndFileReader.cpp
 
 		sndfile/AUD_SndFileFactory.h
 		sndfile/AUD_SndFileReader.h
 	)
-ENDIF(WITH_CODEC_SNDFILE)
+endif()
 
-IF(WITH_SAMPLERATE)
+if(WITH_SAMPLERATE)
-	ADD_DEFINITIONS(-DWITH_SAMPLERATE)
+	add_definitions(-DWITH_SAMPLERATE)
-	SET(SRCFILESRC
+	set(SRCFILESRC
 		SRC/AUD_SRCResampleFactory.cpp
 		SRC/AUD_SRCResampleReader.cpp
 
 		SRC/AUD_SRCResampleFactory.h
 		SRC/AUD_SRCResampleReader.h
 	)
-ENDIF(WITH_SAMPLERATE)
+endif()
 
-IF(WITH_FFTW3 AND FALSE)
+if(WITH_FFTW3 AND FALSE)
-	ADD_DEFINITIONS(-DWITH_FFTW3)
+	add_definitions(-DWITH_FFTW3)
-	LIST(APPEND INC fftw ${FFTW3_INC})
+	list(APPEND INC fftw ${FFTW3_INC})
-	SET(FFTW3SRC
+	set(FFTW3SRC
 		fftw/AUD_BandPassFactory.cpp
 		fftw/AUD_BandPassReader.cpp
 
 		fftw/AUD_BandPassFactory.h
 		fftw/AUD_BandPassReader.h
 	)
-ENDIF(WITH_FFTW3 AND FALSE)
+endif()
 
-IF(WITH_PYTHON)
+if(WITH_PYTHON)
-	LIST(APPEND INC Python ${PYTHON_INC})
+	list(APPEND INC Python ${PYTHON_INC})
-	SET(PYTHONSRC
+	set(PYTHONSRC
 		Python/AUD_PyAPI.cpp
 
 		Python/AUD_PyAPI.h
 	)
-	ADD_DEFINITIONS(-DWITH_PYTHON)
+	add_definitions(-DWITH_PYTHON)
-ENDIF(WITH_PYTHON)
+endif()
 
-SET(SRC
+set(SRC
 	${SRC}
 	${FFMPEGSRC}
 	${SNDFILESRC}
@@ -252,4 +252,4 @@ SET(SRC
 	${PYTHONSRC}
 )
 
-BLENDERLIB(bf_intern_audaspace "${SRC}" "${INC}")
+blenderlib(bf_intern_audaspace "${SRC}" "${INC}")

intern/boolop/CMakeLists.txt

@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC	
+set(INC	
 	.
 	./intern
 	./extern
@@ -36,7 +36,7 @@ SET(INC
 	../../source/blender/makesdna
 )
 
-SET(SRC
+set(SRC
 	intern/BOP_BBox.cpp
 	intern/BOP_BSPNode.cpp
 	intern/BOP_BSPTree.cpp
@@ -75,4 +75,4 @@ SET(SRC
 	intern/BOP_Vertex.h
 )
 
-BLENDERLIB(bf_intern_bop "${SRC}" "${INC}")
+blenderlib(bf_intern_bop "${SRC}" "${INC}")

intern/bsp/CMakeLists.txt

@@ -24,14 +24,14 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	./intern
 	../container
 	../moto/include
 	../memutil
 )
 
-SET(SRC
+set(SRC
 	intern/BSP_CSGMesh.cpp
 	intern/BSP_MeshPrimitives.cpp
 	intern/CSG_BooleanOps.cpp
@@ -43,4 +43,4 @@ SET(SRC
 	intern/BSP_MeshPrimitives.h
 )
 
-BLENDERLIB(bf_intern_bsp "${SRC}" "${INC}")
+blenderlib(bf_intern_bsp "${SRC}" "${INC}")

intern/container/CMakeLists.txt

@@ -24,11 +24,11 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	.
 )
 
-SET(SRC
+set(SRC
 	intern/CTR_List.cpp
 
 	CTR_List.h
@@ -38,4 +38,4 @@ SET(SRC
 	CTR_UHeap.h
 )
 
-BLENDERLIB(bf_intern_ctr "${SRC}" "${INC}")
+blenderlib(bf_intern_ctr "${SRC}" "${INC}")

intern/decimation/CMakeLists.txt

@@ -24,14 +24,14 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	.
 	../container
 	../memutil
 	../moto/include
 )
 
-SET(SRC
+set(SRC
 	intern/LOD_EdgeCollapser.cpp
 	intern/LOD_ExternNormalEditor.cpp
 	intern/LOD_FaceNormalEditor.cpp
@@ -56,4 +56,4 @@ SET(SRC
 	intern/LOD_QuadricEditor.h
 )
 
-BLENDERLIB(bf_intern_decimate "${SRC}" "${INC}")
+blenderlib(bf_intern_decimate "${SRC}" "${INC}")

intern/elbeem/CMakeLists.txt

@@ -24,13 +24,13 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	extern
 	${PNG_INC}
 	${ZLIB_INC}
 )
 
-SET(SRC
+set(SRC
 	intern/attributes.cpp
 	intern/controlparticles.cpp
 	intern/elbeem.cpp
@@ -86,13 +86,13 @@ SET(SRC
 	intern/utilities.h
 )
 
-ADD_DEFINITIONS(-DNOGUI -DELBEEM_BLENDER=1)
+add_definitions(-DNOGUI -DELBEEM_BLENDER=1)
-IF(WINDOWS)
+if(WINDOWS)
-		ADD_DEFINITIONS(-DUSE_MSVC6FIXES)
+		add_definitions(-DUSE_MSVC6FIXES)
-ENDIF(WINDOWS)
+endif()
 
-IF(WITH_OPENMP)
+if(WITH_OPENMP)
-		ADD_DEFINITIONS(-DPARALLEL=1)
+		add_definitions(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
+endif()
 
-BLENDERLIB_NOLIST(bf_intern_elbeem "${SRC}" "${INC}")
+blenderlib_nolist(bf_intern_elbeem "${SRC}" "${INC}")

intern/ghost/CMakeLists.txt

@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	.
 	../string
 	../../extern/glew/include
@@ -32,7 +32,7 @@ SET(INC
 	../../source/blender/makesdna
 )
 
-SET(SRC
+set(SRC
 	intern/GHOST_Buttons.cpp
 	intern/GHOST_CallbackEventConsumer.cpp
 	intern/GHOST_C-api.cpp
@@ -82,9 +82,9 @@ SET(SRC
 	intern/GHOST_WindowManager.h
 )
 
-IF(APPLE)
+if(APPLE)
-	IF(WITH_COCOA)
+	if(WITH_COCOA)
-		LIST(APPEND SRC
+		list(APPEND SRC
 			intern/GHOST_DisplayManagerCocoa.mm
 			intern/GHOST_SystemCocoa.mm
 			intern/GHOST_WindowCocoa.mm
@@ -93,8 +93,8 @@ IF(APPLE)
 			intern/GHOST_SystemCocoa.h
 			intern/GHOST_WindowCocoa.h
 		)
-	ELSE(WITH_COCOA)
+	else()
-		LIST(APPEND SRC
+		list(APPEND SRC
 			intern/GHOST_DisplayManagerCarbon.cpp
 			intern/GHOST_SystemCarbon.cpp
 			intern/GHOST_WindowCarbon.cpp
@@ -103,16 +103,16 @@ IF(APPLE)
 			intern/GHOST_SystemCarbon.h
 			intern/GHOST_WindowCarbon.h
 		)
-	ENDIF(WITH_COCOA)
+	endif()
 
-	IF(WITH_CODEC_QUICKTIME)
+	if(WITH_CODEC_QUICKTIME)
-		ADD_DEFINITIONS(-DWITH_QUICKTIME)
+		add_definitions(-DWITH_QUICKTIME)
-	ENDIF(WITH_CODEC_QUICKTIME)
+	endif()
 
-ELSEIF(UNIX)
+elseif(UNIX)
-	LIST(APPEND INC ${X11_X11_INCLUDE_PATH})
+	list(APPEND INC ${X11_X11_INCLUDE_PATH})
 
-	LIST(APPEND SRC
+	list(APPEND SRC
 		intern/GHOST_DisplayManagerX11.cpp
 		intern/GHOST_SystemX11.cpp
 		intern/GHOST_WindowX11.cpp
@@ -122,16 +122,16 @@ ELSEIF(UNIX)
 		intern/GHOST_WindowX11.h
 	)
 
-	ADD_DEFINITIONS(-DPREFIX="${CMAKE_INSTALL_PREFIX}")
+	add_definitions(-DPREFIX="${CMAKE_INSTALL_PREFIX}")
 
-ELSEIF(WIN32)
+elseif(WIN32)
-	IF(MSVC)
+	if(MSVC)
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
-	ENDIF(MSVC)
+	endif()
 
-	LIST(APPEND INC ${WINTAB_INC})
+	list(APPEND INC ${WINTAB_INC})
 
-	LIST(APPEND SRC
+	list(APPEND SRC
 		intern/GHOST_DisplayManagerWin32.cpp
 		intern/GHOST_SystemWin32.cpp
 		intern/GHOST_WindowWin32.cpp
@@ -142,7 +142,7 @@ ELSEIF(WIN32)
 		intern/GHOST_SystemWin32.h
 		intern/GHOST_WindowWin32.h
 	)
-ENDIF(APPLE)
+endif()
 
-BLENDERLIB(bf_intern_ghost "${SRC}" "${INC}")
+blenderlib(bf_intern_ghost "${SRC}" "${INC}")
 

intern/guardedalloc/CMakeLists.txt

@@ -24,29 +24,29 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC .)
+set(INC .)
 
-SET(SRC
+set(SRC
 	./intern/mallocn.c
 
 	BLO_sys_types.h
 	MEM_guardedalloc.h
 )
 
-IF(WIN32 AND NOT UNIX)
+if(WIN32 AND NOT UNIX)
-	LIST(APPEND SRC
+	list(APPEND SRC
 		intern/mmap_win.c
 
 		mmap_win.h
 	)
-ENDIF(WIN32 AND NOT UNIX)
+endif()
 
-BLENDERLIB(bf_intern_guardedalloc "${SRC}" "${INC}")
+blenderlib(bf_intern_guardedalloc "${SRC}" "${INC}")
 
 # Override C++ alloc, optional.
-IF(WITH_CXX_GUARDEDALLOC)
+if(WITH_CXX_GUARDEDALLOC)
-	SET(SRC
+	set(SRC
 		cpp/mallocn.cpp
 	)
-	BLENDERLIB(bf_intern_guardedalloc_cpp "${SRC}" "${INC}")
+	blenderlib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}")
-ENDIF(WITH_CXX_GUARDEDALLOC)
+endif()

intern/iksolver/CMakeLists.txt

@@ -24,13 +24,13 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	intern
 	../memutil
 	../moto/include
 )
 
-SET(SRC
+set(SRC
 	intern/IK_QJacobian.cpp
 	intern/IK_QJacobianSolver.cpp
 	intern/IK_QSegment.cpp
@@ -70,4 +70,4 @@ SET(SRC
 	intern/TNT/version.h
 )
 
-BLENDERLIB(bf_intern_ik "${SRC}" "${INC}")
+blenderlib(bf_intern_ik "${SRC}" "${INC}")

intern/itasc/CMakeLists.txt

@@ -24,11 +24,11 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../../extern/Eigen2
 )
 
-SET(SRC
+set(SRC
 	Armature.cpp
 	Cache.cpp
 	ConstraintSet.cpp
@@ -222,4 +222,4 @@ SET(SRC
 	../../extern/Eigen2/Eigen/src/Sparse/UmfPackSupport.h
 )
 
-BLENDERLIB(bf_intern_itasc "${SRC}" "${INC}")
+blenderlib(bf_intern_itasc "${SRC}" "${INC}")

intern/memutil/CMakeLists.txt

@@ -24,12 +24,12 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	.
 	..
 )
 
-SET(SRC
+set(SRC
 	intern/MEM_CacheLimiterC-Api.cpp
 	intern/MEM_RefCountedC-Api.cpp
 
@@ -43,4 +43,4 @@ SET(SRC
 	MEM_SmartPtr.h
 )
 
-BLENDERLIB(bf_intern_memutil "${SRC}" "${INC}")
+blenderlib(bf_intern_memutil "${SRC}" "${INC}")

intern/moto/CMakeLists.txt

@@ -24,11 +24,11 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	include
 )
 
-SET(SRC
+set(SRC
 	intern/MT_Assert.cpp
 	intern/MT_CmMatrix4x4.cpp
 	intern/MT_Matrix3x3.cpp
@@ -67,4 +67,4 @@ SET(SRC
 	include/NM_Scalar.h
 )
 
-BLENDERLIB(bf_intern_moto "${SRC}" "${INC}")
+blenderlib(bf_intern_moto "${SRC}" "${INC}")

intern/opennl/CMakeLists.txt

@@ -25,14 +25,14 @@
 # ***** END GPL LICENSE BLOCK *****
 
 # External project, better not fix warnings.
-REMOVE_STRICT_FLAGS()
+remove_strict_flags()
 
-SET(INC
+set(INC
 	extern
 	superlu
 )
 
-SET(SRC
+set(SRC
 	intern/opennl.c
 	superlu/colamd.c
 	superlu/get_perm_c.c
@@ -75,4 +75,4 @@ SET(SRC
 	superlu/util.h
 )
 
-BLENDERLIB(bf_intern_opennl "${SRC}" "${INC}")
+blenderlib(bf_intern_opennl "${SRC}" "${INC}")

intern/smoke/CMakeLists.txt

@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	intern
 	../memutil
 	../../extern/bullet2/src
@@ -32,7 +32,7 @@ SET(INC
 	${ZLIB_INC}
 )
 
-SET(SRC
+set(SRC
 	intern/EIGENVALUE_HELPER.cpp
 	intern/FLUID_3D.cpp
 	intern/FLUID_3D_SOLVERS.cpp
@@ -80,14 +80,14 @@ SET(SRC
 	intern/tnt/tnt_version.h
 )
 
-IF(WITH_OPENMP)
+if(WITH_OPENMP)
-		ADD_DEFINITIONS(-DPARALLEL=1)
+		add_definitions(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
+endif()
 
-IF(WITH_FFTW3)
+if(WITH_FFTW3)
-	ADD_DEFINITIONS(-DFFTW3=1)
+	add_definitions(-DFFTW3=1)
-	LIST(APPEND INC ${FFTW3_INC})
+	list(APPEND INC ${FFTW3_INC})
-ENDIF(WITH_FFTW3)
+endif()
 
-BLENDERLIB(bf_intern_smoke "${SRC}" "${INC}")
+blenderlib(bf_intern_smoke "${SRC}" "${INC}")
 

intern/string/CMakeLists.txt

@@ -24,15 +24,15 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	.
 )
 
-SET(SRC
+set(SRC
 	intern/STR_String.cpp
 
 	STR_HashedString.h
 	STR_String.h
 )
 
-BLENDERLIB(bf_intern_string "${SRC}" "${INC}")
+blenderlib(bf_intern_string "${SRC}" "${INC}")

source/CMakeLists.txt

@@ -24,13 +24,13 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-ADD_SUBDIRECTORY(blender)
+add_subdirectory(blender)
 
-IF(WITH_GAMEENGINE)
+if(WITH_GAMEENGINE)
-	ADD_SUBDIRECTORY(kernel)
+	add_subdirectory(kernel)
-	ADD_SUBDIRECTORY(gameengine)
+	add_subdirectory(gameengine)
-ENDIF(WITH_GAMEENGINE)
+endif()
 	
-IF(WINDOWS)
+if(WINDOWS)
-	ADD_SUBDIRECTORY(icons)
+	add_subdirectory(icons)
-ENDIF(WINDOWS)
+endif()

source/blender/CMakeLists.txt

@@ -24,45 +24,45 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-ADD_SUBDIRECTORY(editors)
+add_subdirectory(editors)
-ADD_SUBDIRECTORY(windowmanager)
+add_subdirectory(windowmanager)
-ADD_SUBDIRECTORY(blenkernel)
+add_subdirectory(blenkernel)
-ADD_SUBDIRECTORY(blenlib)
+add_subdirectory(blenlib)
-ADD_SUBDIRECTORY(render)
+add_subdirectory(render)
-ADD_SUBDIRECTORY(blenfont)
+add_subdirectory(blenfont)
-ADD_SUBDIRECTORY(blenloader)
+add_subdirectory(blenloader)
-ADD_SUBDIRECTORY(readblenfile)
+add_subdirectory(readblenfile)
-ADD_SUBDIRECTORY(blenpluginapi)
+add_subdirectory(blenpluginapi)
-ADD_SUBDIRECTORY(ikplugin)
+add_subdirectory(ikplugin)
-ADD_SUBDIRECTORY(gpu)
+add_subdirectory(gpu)
-ADD_SUBDIRECTORY(imbuf)
+add_subdirectory(imbuf)
-ADD_SUBDIRECTORY(avi)
+add_subdirectory(avi)
-ADD_SUBDIRECTORY(nodes)
+add_subdirectory(nodes)
-ADD_SUBDIRECTORY(modifiers)
+add_subdirectory(modifiers)
-ADD_SUBDIRECTORY(makesdna)
+add_subdirectory(makesdna)
-ADD_SUBDIRECTORY(makesrna)
+add_subdirectory(makesrna)
 
-IF(WITH_IMAGE_OPENEXR)
+if(WITH_IMAGE_OPENEXR)
-	ADD_SUBDIRECTORY(imbuf/intern/openexr)
+	add_subdirectory(imbuf/intern/openexr)
-ENDIF(WITH_IMAGE_OPENEXR)
+endif()
 
-IF(WITH_IMAGE_DDS)
+if(WITH_IMAGE_DDS)
-	ADD_SUBDIRECTORY(imbuf/intern/dds)
+	add_subdirectory(imbuf/intern/dds)
-ENDIF(WITH_IMAGE_DDS)
+endif()
 
-IF(WITH_IMAGE_CINEON)
+if(WITH_IMAGE_CINEON)
-	ADD_SUBDIRECTORY(imbuf/intern/cineon)
+	add_subdirectory(imbuf/intern/cineon)
-ENDIF(WITH_IMAGE_CINEON)
+endif()
 
-IF(WITH_CODEC_QUICKTIME)
+if(WITH_CODEC_QUICKTIME)
-	ADD_SUBDIRECTORY(quicktime)
+	add_subdirectory(quicktime)
-ENDIF(WITH_CODEC_QUICKTIME)
+endif()
 
-IF(WITH_PYTHON)
+if(WITH_PYTHON)
-	ADD_SUBDIRECTORY(python)
+	add_subdirectory(python)
-ENDIF(WITH_PYTHON)
+endif()
 
-IF(WITH_OPENCOLLADA)
+if(WITH_OPENCOLLADA)
-  ADD_SUBDIRECTORY(collada)
+  add_subdirectory(collada)
-ENDIF(WITH_OPENCOLLADA)
+endif()
 

source/blender/avi/CMakeLists.txt

@@ -24,13 +24,13 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC 
+set(INC 
 	.
 	../../../intern/guardedalloc
 	${JPEG_INC}
 )
 
-SET(SRC
+set(SRC
 	intern/avi.c
 	intern/avirgb.c
 	intern/codecs.c
@@ -47,4 +47,4 @@ SET(SRC
 	intern/rgb32.h
 )
 
-BLENDERLIB(bf_avi "${SRC}" "${INC}")
+blenderlib(bf_avi "${SRC}" "${INC}")

source/blender/blenfont/CMakeLists.txt

@@ -22,7 +22,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	.
 	../blenlib
 	../makesdna
@@ -33,7 +33,7 @@ SET(INC
 	${FREETYPE_INCLUDE_DIRS}
 )
 
-SET(SRC
+set(SRC
 	intern/blf.c
 	intern/blf_dir.c
 	intern/blf_font.c
@@ -47,14 +47,14 @@ SET(SRC
 	intern/blf_internal_types.h
 )
 
-IF(WITH_INTERNATIONAL)
+if(WITH_INTERNATIONAL)
-	LIST(APPEND INC ${GETTEXT_INC})
+	list(APPEND INC ${GETTEXT_INC})
-	ADD_DEFINITIONS(-DINTERNATIONAL)
+	add_definitions(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
+endif()
 
-IF(WIN32 AND NOT UNIX)
+if(WIN32 AND NOT UNIX)
-	ADD_DEFINITIONS(-DUSE_GETTEXT_DLL)
+	add_definitions(-DUSE_GETTEXT_DLL)
-ENDIF(WIN32 AND NOT UNIX)
+endif()
 
-BLENDERLIB(bf_blenfont "${SRC}" "${INC}")
+blenderlib(bf_blenfont "${SRC}" "${INC}")
 

source/blender/blenkernel/CMakeLists.txt

@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC 
+set(INC 
 	.
 	../avi
 	../blenlib
@@ -52,7 +52,7 @@ SET(INC
 	${ZLIB_INC}
 )
 
-SET(SRC
+set(SRC
 	intern/BME_Customdata.c
 	intern/BME_conversions.c
 	intern/BME_eulers.c
@@ -225,81 +225,81 @@ SET(SRC
 	nla_private.h
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
+add_definitions(-DGLEW_STATIC)
 
-IF(WITH_BULLET)
+if(WITH_BULLET)
-	LIST(APPEND INC ../../../extern/bullet2/src)
+	list(APPEND INC ../../../extern/bullet2/src)
-	ADD_DEFINITIONS(-DUSE_BULLET)
+	add_definitions(-DUSE_BULLET)
-ENDIF(WITH_BULLET)
+endif()
 
-IF(WITH_IMAGE_OPENEXR)
+if(WITH_IMAGE_OPENEXR)
-	ADD_DEFINITIONS(-DWITH_OPENEXR)
+	add_definitions(-DWITH_OPENEXR)
-ENDIF(WITH_IMAGE_OPENEXR)
+endif()
 
-IF(WITH_IMAGE_TIFF)
+if(WITH_IMAGE_TIFF)
-	ADD_DEFINITIONS(-DWITH_TIFF)
+	add_definitions(-DWITH_TIFF)
-ENDIF(WITH_IMAGE_TIFF)
+endif()
 
-IF(WITH_IMAGE_OPENJPEG)
+if(WITH_IMAGE_OPENJPEG)
-	ADD_DEFINITIONS(-DWITH_OPENJPEG)
+	add_definitions(-DWITH_OPENJPEG)
-ENDIF(WITH_IMAGE_OPENJPEG)
+endif()
 
-IF(WITH_IMAGE_DDS)
+if(WITH_IMAGE_DDS)
-	ADD_DEFINITIONS(-DWITH_DDS)
+	add_definitions(-DWITH_DDS)
-ENDIF(WITH_IMAGE_DDS)
+endif()
 
-IF(WITH_IMAGE_CINEON)
+if(WITH_IMAGE_CINEON)
-	ADD_DEFINITIONS(-DWITH_CINEON)
+	add_definitions(-DWITH_CINEON)
-ENDIF(WITH_IMAGE_CINEON)
+endif()
 
-IF(WITH_IMAGE_HDR)
+if(WITH_IMAGE_HDR)
-	ADD_DEFINITIONS(-DWITH_HDR)
+	add_definitions(-DWITH_HDR)
-ENDIF(WITH_IMAGE_HDR)
+endif()
 
-IF(WITH_CODEC_QUICKTIME)
+if(WITH_CODEC_QUICKTIME)
-	LIST(APPEND INC ../quicktime ${QUICKTIME_INC})
+	list(APPEND INC ../quicktime ${QUICKTIME_INC})
-	ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	add_definitions(-DWITH_QUICKTIME)
-ENDIF(WITH_CODEC_QUICKTIME)
+endif()
 
-IF(WITH_CODEC_FFMPEG)
+if(WITH_CODEC_FFMPEG)
-	LIST(APPEND INC ${FFMPEG_INC})
+	list(APPEND INC ${FFMPEG_INC})
-	ADD_DEFINITIONS(-DWITH_FFMPEG)
+	add_definitions(-DWITH_FFMPEG)
-ENDIF(WITH_CODEC_FFMPEG)
+endif()
 
-IF(WITH_LCMS)
+if(WITH_LCMS)
-	LIST(APPEND INC ${LCMS_INCLUDE_DIR})
+	list(APPEND INC ${LCMS_INCLUDE_DIR})
-	ADD_DEFINITIONS(-DWITH_LCMS)
+	add_definitions(-DWITH_LCMS)
-ENDIF(WITH_LCMS)
+endif()
 
-IF(WITH_PYTHON)
+if(WITH_PYTHON)
-	LIST(APPEND INC ../python ${PYTHON_INC})
+	list(APPEND INC ../python ${PYTHON_INC})
-	ADD_DEFINITIONS(-DWITH_PYTHON)
+	add_definitions(-DWITH_PYTHON)
-ENDIF(WITH_PYTHON)
+endif()
 
-IF(WITH_OPENMP)
+if(WITH_OPENMP)
-	ADD_DEFINITIONS(-DPARALLEL=1)
+	add_definitions(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
+endif()
 
-IF(NOT WITH_MOD_FLUID)
+if(NOT WITH_MOD_FLUID)
-	ADD_DEFINITIONS(-DDISABLE_ELBEEM)
+	add_definitions(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_MOD_FLUID)
+endif()
 
-IF(WITH_JACK)
+if(WITH_JACK)
-	ADD_DEFINITIONS(-DWITH_JACK)
+	add_definitions(-DWITH_JACK)
-ENDIF(WITH_JACK)
+endif()
 
-IF(WITH_LZO)
+if(WITH_LZO)
-	LIST(APPEND INC ../../../extern/lzo/minilzo)
+	list(APPEND INC ../../../extern/lzo/minilzo)
-	ADD_DEFINITIONS(-DWITH_LZO)
+	add_definitions(-DWITH_LZO)
-ENDIF(WITH_LZO)
+endif()
 
-IF(WITH_LZMA)
+if(WITH_LZMA)
-	LIST(APPEND INC ../../../extern/lzma)
+	list(APPEND INC ../../../extern/lzma)
-	ADD_DEFINITIONS(-DWITH_LZMA)
+	add_definitions(-DWITH_LZMA)
-ENDIF(WITH_LZMA)
+endif()
 
-IF(MSVC)
+if(MSVC)
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
-ENDIF(MSVC)
+endif()
 
-BLENDERLIB(bf_blenkernel "${SRC}" "${INC}")
+blenderlib(bf_blenkernel "${SRC}" "${INC}")

source/blender/blenlib/CMakeLists.txt

@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC 
+set(INC 
 	.
 	../makesdna
 	../blenkernel
@@ -35,7 +35,7 @@ SET(INC
 	${FREETYPE_INCLUDE_DIRS}
 )
 
-SET(SRC
+set(SRC
 	intern/BLI_args.c
 	intern/BLI_dynstr.c
 	intern/BLI_ghash.c
@@ -131,12 +131,12 @@ SET(SRC
 	intern/dynamiclist.h
 )
 
-IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-	LIST(APPEND INC "${BINRELOC_INC}")
+	list(APPEND INC "${BINRELOC_INC}")
-ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+endif()
 
-IF(WITH_OPENMP)
+if(WITH_OPENMP)
-	ADD_DEFINITIONS(-DPARALLEL=1)
+	add_definitions(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
+endif()
 
-BLENDERLIB(bf_blenlib "${SRC}" "${INC}")
+blenderlib(bf_blenlib "${SRC}" "${INC}")

source/blender/blenloader/CMakeLists.txt

@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC 
+set(INC 
 	.
 	../blenlib
 	../blenkernel
@@ -36,7 +36,7 @@ SET(INC
 	${ZLIB_INC}
 )
 
-SET(SRC
+set(SRC
 	intern/readblenentry.c
 	intern/readfile.c
 	intern/undofile.c
@@ -50,4 +50,4 @@ SET(SRC
 	intern/readfile.h
 )
 
-BLENDERLIB(bf_blenloader "${SRC}" "${INC}")
+blenderlib(bf_blenloader "${SRC}" "${INC}")

source/blender/blenpluginapi/CMakeLists.txt

@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC 
+set(INC 
 	.
 	..
 	../blenlib
@@ -33,7 +33,7 @@ SET(INC
 	../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	intern/pluginapi.c
 
 	documentation.h
@@ -44,9 +44,9 @@ SET(SRC
 	util.h
 )
 
-IF(WITH_CODEC_QUICKTIME)
+if(WITH_CODEC_QUICKTIME)
-	LIST(APPEND INC ${QUICKTIME_INC})
+	list(APPEND INC ${QUICKTIME_INC})
-	ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	add_definitions(-DWITH_QUICKTIME)
-ENDIF(WITH_CODEC_QUICKTIME)
+endif()
 
-BLENDERLIB(bf_blenpluginapi "${SRC}" "${INC}")
+blenderlib(bf_blenpluginapi "${SRC}" "${INC}")

source/blender/collada/CMakeLists.txt

@@ -24,9 +24,9 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-REMOVE_STRICT_FLAGS()
+remove_strict_flags()
 
-SET(INC
+set(INC
 	.
 	../blenlib
 	../blenkernel
@@ -37,23 +37,23 @@ SET(INC
 	../../../intern/guardedalloc
 )
 
-IF(APPLE)
+if(APPLE)
-	LIST(APPEND INC
+	list(APPEND INC
 		${OPENCOLLADA_INC}/COLLADAStreamWriter
 		${OPENCOLLADA_INC}/COLLADABaseUtils
 		${OPENCOLLADA_INC}/COLLADAFramework
 		${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader 
 	)
-ELSE(APPLE)
+else()
-	LIST(APPEND INC
+	list(APPEND INC
 		${OPENCOLLADA_INC}/COLLADAStreamWriter/include
 		${OPENCOLLADA_INC}/COLLADABaseUtils/include
 		${OPENCOLLADA_INC}/COLLADAFramework/include
 		${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader/include 
 	)
-ENDIF(APPLE)
+endif()
 
-SET(SRC
+set(SRC
 	AnimationImporter.cpp
 	ArmatureExporter.cpp
 	ArmatureImporter.cpp
@@ -95,8 +95,8 @@ SET(SRC
 	collada_utils.h
 )
 
-IF(WITH_BUILDINFO)
+if(WITH_BUILDINFO)
-	ADD_DEFINITIONS(-DNAN_BUILDINFO)
+	add_definitions(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
+endif()
 
-BLENDERLIB(bf_collada "${SRC}" "${INC}")
+blenderlib(bf_collada "${SRC}" "${INC}")

source/blender/editors/CMakeLists.txt

@@ -19,39 +19,39 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-ADD_SUBDIRECTORY(animation)
+add_subdirectory(animation)
-ADD_SUBDIRECTORY(armature)
+add_subdirectory(armature)
-ADD_SUBDIRECTORY(curve)
+add_subdirectory(curve)
-ADD_SUBDIRECTORY(datafiles)
+add_subdirectory(datafiles)
-ADD_SUBDIRECTORY(gpencil)
+add_subdirectory(gpencil)
-ADD_SUBDIRECTORY(interface)
+add_subdirectory(interface)
-ADD_SUBDIRECTORY(mesh)
+add_subdirectory(mesh)
-ADD_SUBDIRECTORY(metaball)
+add_subdirectory(metaball)
-ADD_SUBDIRECTORY(object)
+add_subdirectory(object)
-ADD_SUBDIRECTORY(physics)
+add_subdirectory(physics)
-ADD_SUBDIRECTORY(render)
+add_subdirectory(render)
-ADD_SUBDIRECTORY(screen)
+add_subdirectory(screen)
-ADD_SUBDIRECTORY(sculpt_paint)
+add_subdirectory(sculpt_paint)
-ADD_SUBDIRECTORY(sound)
+add_subdirectory(sound)
-ADD_SUBDIRECTORY(space_action)
+add_subdirectory(space_action)
-ADD_SUBDIRECTORY(space_api)
+add_subdirectory(space_api)
-ADD_SUBDIRECTORY(space_buttons)
+add_subdirectory(space_buttons)
-ADD_SUBDIRECTORY(space_console)
+add_subdirectory(space_console)
-ADD_SUBDIRECTORY(space_file)
+add_subdirectory(space_file)
-ADD_SUBDIRECTORY(space_graph)
+add_subdirectory(space_graph)
-ADD_SUBDIRECTORY(space_image)
+add_subdirectory(space_image)
-ADD_SUBDIRECTORY(space_info)
+add_subdirectory(space_info)
-ADD_SUBDIRECTORY(space_logic)
+add_subdirectory(space_logic)
-ADD_SUBDIRECTORY(space_nla)
+add_subdirectory(space_nla)
-ADD_SUBDIRECTORY(space_node)
+add_subdirectory(space_node)
-ADD_SUBDIRECTORY(space_outliner)
+add_subdirectory(space_outliner)
-ADD_SUBDIRECTORY(space_script)
+add_subdirectory(space_script)
-ADD_SUBDIRECTORY(space_sequencer)
+add_subdirectory(space_sequencer)
-ADD_SUBDIRECTORY(space_sound)
+add_subdirectory(space_sound)
-ADD_SUBDIRECTORY(space_text)
+add_subdirectory(space_text)
-ADD_SUBDIRECTORY(space_time)
+add_subdirectory(space_time)
-ADD_SUBDIRECTORY(space_userpref)
+add_subdirectory(space_userpref)
-ADD_SUBDIRECTORY(space_view3d)
+add_subdirectory(space_view3d)
-ADD_SUBDIRECTORY(transform)
+add_subdirectory(transform)
-ADD_SUBDIRECTORY(util)
+add_subdirectory(util)
-ADD_SUBDIRECTORY(uvedit)
+add_subdirectory(uvedit)

source/blender/editors/animation/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -29,7 +29,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	anim_channels_defines.c
 	anim_channels_edit.c
 	anim_deps.c
@@ -49,4 +49,4 @@ SET(SRC
 	anim_intern.h
 )
 
-BLENDERLIB(bf_editor_animation "${SRC}" "${INC}")
+blenderlib(bf_editor_animation "${SRC}" "${INC}")

source/blender/editors/armature/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -30,7 +30,7 @@ SET(INC
 	../../../../intern/opennl/extern
 )
 
-SET(SRC
+set(SRC
 	armature_ops.c
 	editarmature.c
 	editarmature_generate.c
@@ -50,4 +50,4 @@ SET(SRC
 	reeb.h
 )
 
-BLENDERLIB(bf_editor_armature "${SRC}" "${INC}")
+blenderlib(bf_editor_armature "${SRC}" "${INC}")

source/blender/editors/curve/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -29,7 +29,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	curve_ops.c
 	editcurve.c
 	editfont.c
@@ -38,4 +38,4 @@ SET(SRC
 	curve_intern.h
 )
 
-BLENDERLIB(bf_editor_curve "${SRC}" "${INC}")
+blenderlib(bf_editor_curve "${SRC}" "${INC}")

source/blender/editors/datafiles/CMakeLists.txt

@@ -19,9 +19,9 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC "")
+set(INC "")
 
-SET(SRC
+set(SRC
 	Bfont.c
 	add.png.c
 	bfont.ttf.c
@@ -60,4 +60,4 @@ SET(SRC
 	vertexdraw.png.c
 )
 
-BLENDERLIB(bf_editor_datafiles "${SRC}" "${INC}")
+blenderlib(bf_editor_datafiles "${SRC}" "${INC}")

source/blender/editors/gpencil/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -30,7 +30,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	drawgpencil.c
 	editaction_gpencil.c
 	gpencil_buttons.c
@@ -41,4 +41,4 @@ SET(SRC
 	gpencil_intern.h
 )
 
-BLENDERLIB(bf_editor_gpencil "${SRC}" "${INC}")
+blenderlib(bf_editor_gpencil "${SRC}" "${INC}")

source/blender/editors/interface/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenfont
 	../../blenkernel
@@ -33,7 +33,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	interface.c
 	interface_anim.c
 	interface_draw.c
@@ -54,12 +54,12 @@ SET(SRC
 	interface_intern.h
 )
 
-IF(WITH_INTERNATIONAL)
+if(WITH_INTERNATIONAL)
-	ADD_DEFINITIONS(-DINTERNATIONAL)
+	add_definitions(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
+endif()
 
-IF(WITH_PYTHON)
+if(WITH_PYTHON)
-	ADD_DEFINITIONS(-DWITH_PYTHON)
+	add_definitions(-DWITH_PYTHON)
-ENDIF(WITH_PYTHON)
+endif()
 
-BLENDERLIB(bf_editor_interface "${SRC}" "${INC}")
+blenderlib(bf_editor_interface "${SRC}" "${INC}")

source/blender/editors/mesh/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -31,7 +31,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	editface.c
 	editmesh.c
 	editmesh_add.c
@@ -47,4 +47,4 @@ SET(SRC
 	mesh_intern.h
 )
 
-BLENDERLIB(bf_editor_mesh "${SRC}" "${INC}")
+blenderlib(bf_editor_mesh "${SRC}" "${INC}")

source/blender/editors/metaball/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -30,11 +30,11 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	mball_edit.c
 	mball_ops.c
 
 	mball_intern.h
 )
 
-BLENDERLIB(bf_editor_metaball "${SRC}" "${INC}")
+blenderlib(bf_editor_metaball "${SRC}" "${INC}")

source/blender/editors/object/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -34,7 +34,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	object_add.c
 	object_bake.c
 	object_constraint.c
@@ -53,8 +53,8 @@ SET(SRC
 	object_intern.h
 )
 
-IF(WITH_PYTHON)
+if(WITH_PYTHON)
-	ADD_DEFINITIONS(-DWITH_PYTHON)
+	add_definitions(-DWITH_PYTHON)
-ENDIF(WITH_PYTHON)
+endif()
 
-BLENDERLIB(bf_editor_object "${SRC}" "${INC}")
+blenderlib(bf_editor_object "${SRC}" "${INC}")

source/blender/editors/physics/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -30,7 +30,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	particle_boids.c
 	particle_edit.c
 	particle_object.c
@@ -41,12 +41,12 @@ SET(SRC
 	physics_intern.h
 )
 
-IF(NOT WITH_MOD_FLUID)
+if(NOT WITH_MOD_FLUID)
-	ADD_DEFINITIONS(-DDISABLE_ELBEEM)
+	add_definitions(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_MOD_FLUID)
+endif()
 
-IF(WITH_OPENMP)
+if(WITH_OPENMP)
-		ADD_DEFINITIONS(-DPARALLEL=1)
+		add_definitions(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
+endif()
 
-BLENDERLIB(bf_editor_physics "${SRC}" "${INC}")
+blenderlib(bf_editor_physics "${SRC}" "${INC}")

source/blender/editors/render/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenfont
 	../../blenkernel
@@ -35,7 +35,7 @@ SET(INC
 	../../../../extern/glew/include
 )
 
-SET(SRC
+set(SRC
 	render_internal.c
 	render_opengl.c
 	render_ops.c
@@ -45,13 +45,13 @@ SET(SRC
 	render_intern.h
 )
 
-IF(WITH_CODEC_QUICKTIME)
+if(WITH_CODEC_QUICKTIME)
-	LIST(APPEND INC ../../quicktime ${QUICKTIME_INC})
+	list(APPEND INC ../../quicktime ${QUICKTIME_INC})
-	ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	add_definitions(-DWITH_QUICKTIME)
-ENDIF(WITH_CODEC_QUICKTIME)
+endif()
 
-IF(WITH_OPENMP)
+if(WITH_OPENMP)
-	ADD_DEFINITIONS(-DPARALLEL=1)
+	add_definitions(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
+endif()
 
-BLENDERLIB(bf_editor_render "${SRC}" "${INC}")
+blenderlib(bf_editor_render "${SRC}" "${INC}")

source/blender/editors/screen/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenfont
 	../../blenkernel
@@ -31,7 +31,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	area.c
 	glutil.c
 	screen_context.c
@@ -42,4 +42,4 @@ SET(SRC
 	screen_intern.h
 )
 
-BLENDERLIB(bf_editor_screen "${SRC}" "${INC}")
+blenderlib(bf_editor_screen "${SRC}" "${INC}")

source/blender/editors/sculpt_paint/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../imbuf
@@ -32,7 +32,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	paint_image.c
 	paint_ops.c
 	paint_stroke.c
@@ -46,4 +46,4 @@ SET(SRC
 	sculpt_intern.h
 )
 
-BLENDERLIB(bf_editor_sculpt_paint "${SRC}" "${INC}")
+blenderlib(bf_editor_sculpt_paint "${SRC}" "${INC}")

source/blender/editors/sound/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -30,10 +30,10 @@ SET(INC
 	../../../../intern/audaspace/intern
 )
 
-SET(SRC
+set(SRC
 	sound_ops.c
 
 	sound_intern.h
 )
 
-BLENDERLIB(bf_editor_sound "${SRC}" "${INC}")
+blenderlib(bf_editor_sound "${SRC}" "${INC}")

source/blender/editors/space_action/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -29,7 +29,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	action_draw.c
 	action_edit.c
 	action_ops.c
@@ -39,4 +39,4 @@ SET(SRC
 	action_intern.h
 )
 
-BLENDERLIB(bf_editor_space_action "${SRC}" "${INC}")
+blenderlib(bf_editor_space_action "${SRC}" "${INC}")

source/blender/editors/space_api/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -29,9 +29,9 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	space.c
 	spacetypes.c
 )
 
-BLENDERLIB(bf_editor_space_api "${SRC}" "${INC}")
+blenderlib(bf_editor_space_api "${SRC}" "${INC}")

source/blender/editors/space_buttons/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -29,7 +29,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	buttons_context.c
 	buttons_header.c
 	buttons_ops.c
@@ -38,4 +38,4 @@ SET(SRC
 	buttons_intern.h
 )
 
-BLENDERLIB(bf_editor_space_buttons "${SRC}" "${INC}")
+blenderlib(bf_editor_space_buttons "${SRC}" "${INC}")

source/blender/editors/space_console/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenfont
 	../../blenkernel
@@ -31,7 +31,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	console_draw.c
 	console_ops.c
 	space_console.c
@@ -39,8 +39,8 @@ SET(SRC
 	console_intern.h
 )
 
-IF(WITH_PYTHON)
+if(WITH_PYTHON)
-	ADD_DEFINITIONS(-DWITH_PYTHON)
+	add_definitions(-DWITH_PYTHON)
-ENDIF(WITH_PYTHON)
+endif()
 
-BLENDERLIB(bf_editor_space_console "${SRC}" "${INC}")
+blenderlib(bf_editor_space_console "${SRC}" "${INC}")

source/blender/editors/space_file/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenfont
 	../../blenkernel
@@ -33,7 +33,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	file_draw.c
 	file_ops.c
 	file_panels.c
@@ -47,28 +47,28 @@ SET(SRC
 	fsmenu.h
 )
 
-IF(WITH_IMAGE_OPENEXR)
+if(WITH_IMAGE_OPENEXR)
-	ADD_DEFINITIONS(-DWITH_OPENEXR)
+	add_definitions(-DWITH_OPENEXR)
-ENDIF(WITH_IMAGE_OPENEXR)
+endif()
 
-IF(WITH_IMAGE_TIFF)
+if(WITH_IMAGE_TIFF)
-	ADD_DEFINITIONS(-DWITH_TIFF)
+	add_definitions(-DWITH_TIFF)
-ENDIF(WITH_IMAGE_TIFF)
+endif()
 
-IF(WITH_IMAGE_OPENJPEG)
+if(WITH_IMAGE_OPENJPEG)
-	ADD_DEFINITIONS(-DWITH_OPENJPEG)
+	add_definitions(-DWITH_OPENJPEG)
-ENDIF(WITH_IMAGE_OPENJPEG)
+endif()
 
-IF(WITH_IMAGE_DDS)
+if(WITH_IMAGE_DDS)
-	ADD_DEFINITIONS(-DWITH_DDS)
+	add_definitions(-DWITH_DDS)
-ENDIF(WITH_IMAGE_DDS)
+endif()
 
-IF(WITH_IMAGE_CINEON)
+if(WITH_IMAGE_CINEON)
-	ADD_DEFINITIONS(-DWITH_CINEON)
+	add_definitions(-DWITH_CINEON)
-ENDIF(WITH_IMAGE_CINEON)
+endif()
 
-IF(WITH_IMAGE_HDR)
+if(WITH_IMAGE_HDR)
-	ADD_DEFINITIONS(-DWITH_HDR)
+	add_definitions(-DWITH_HDR)
-ENDIF(WITH_IMAGE_HDR)
+endif()
 
-BLENDERLIB(bf_editor_space_file "${SRC}" "${INC}")
+blenderlib(bf_editor_space_file "${SRC}" "${INC}")

source/blender/editors/space_graph/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -30,7 +30,7 @@ SET(INC
 	../../../../intern/audaspace/intern
 )
 
-SET(SRC
+set(SRC
 	graph_buttons.c
 	graph_draw.c
 	graph_edit.c
@@ -42,4 +42,4 @@ SET(SRC
 	graph_intern.h
 )
 
-BLENDERLIB(bf_editor_space_graph "${SRC}" "${INC}")
+blenderlib(bf_editor_space_graph "${SRC}" "${INC}")

source/blender/editors/space_image/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenfont
 	../../blenkernel
@@ -32,7 +32,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	image_buttons.c
 	image_draw.c
 	image_header.c
@@ -43,25 +43,25 @@ SET(SRC
 	image_intern.h
 )
 
-IF(WITH_IMAGE_OPENJPEG)
+if(WITH_IMAGE_OPENJPEG)
-	ADD_DEFINITIONS(-DWITH_OPENJPEG)
+	add_definitions(-DWITH_OPENJPEG)
-ENDIF(WITH_IMAGE_OPENJPEG)
+endif()
 
-IF(WITH_IMAGE_OPENEXR)
+if(WITH_IMAGE_OPENEXR)
-	ADD_DEFINITIONS(-DWITH_OPENEXR)
+	add_definitions(-DWITH_OPENEXR)
-ENDIF(WITH_IMAGE_OPENEXR)
+endif()
 
-IF(WITH_IMAGE_TIFF)
+if(WITH_IMAGE_TIFF)
-	ADD_DEFINITIONS(-DWITH_TIFF)
+	add_definitions(-DWITH_TIFF)
-ENDIF(WITH_IMAGE_TIFF)
+endif()
 
-IF(WITH_IMAGE_CINEON)
+if(WITH_IMAGE_CINEON)
-	ADD_DEFINITIONS(-DWITH_CINEON)
+	add_definitions(-DWITH_CINEON)
-ENDIF(WITH_IMAGE_CINEON)
+endif()
 
-IF(WITH_LCMS)
+if(WITH_LCMS)
-	SET(INC ${INC} ${LCMS_INCLUDE_DIR})
+	set(INC ${INC} ${LCMS_INCLUDE_DIR})
-	ADD_DEFINITIONS(-DWITH_LCMS)
+	add_definitions(-DWITH_LCMS)
-ENDIF(WITH_LCMS)
+endif()
 
-BLENDERLIB(bf_editor_space_image "${SRC}" "${INC}")
+blenderlib(bf_editor_space_image "${SRC}" "${INC}")

source/blender/editors/space_info/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenfont
 	../../blenkernel
@@ -31,7 +31,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	info_ops.c
 	info_stats.c
 	info_draw.c
@@ -43,4 +43,4 @@ SET(SRC
 	textview.h
 )
 
-BLENDERLIB(bf_editor_space_info "${SRC}" "${INC}")
+blenderlib(bf_editor_space_info "${SRC}" "${INC}")

source/blender/editors/space_logic/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -30,7 +30,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	logic_buttons.c
 	logic_ops.c
 	logic_window.c
@@ -39,8 +39,8 @@ SET(SRC
 	logic_intern.h
 )
 
-IF(WITH_GAMEENGINE)
+if(WITH_GAMEENGINE)
-	ADD_DEFINITIONS(-DWITH_GAMEENGINE)
+	add_definitions(-DWITH_GAMEENGINE)
-ENDIF(WITH_GAMEENGINE)
+endif()
 
-BLENDERLIB(bf_editor_space_logic "${SRC}" "${INC}")
+blenderlib(bf_editor_space_logic "${SRC}" "${INC}")

source/blender/editors/space_nla/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -29,7 +29,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	nla_buttons.c
 	nla_channels.c
 	nla_draw.c
@@ -41,4 +41,4 @@ SET(SRC
 	nla_intern.h
 )
 
-BLENDERLIB(bf_editor_space_nla "${SRC}" "${INC}")
+blenderlib(bf_editor_space_nla "${SRC}" "${INC}")

source/blender/editors/space_node/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -33,7 +33,7 @@ SET(INC
 	../../../../intern/opennl/extern
 )
 
-SET(SRC
+set(SRC
 	drawnode.c
 	node_buttons.c
 	node_draw.c
@@ -47,4 +47,4 @@ SET(SRC
 	node_intern.h
 )
 
-BLENDERLIB(bf_editor_space_node "${SRC}" "${INC}")
+blenderlib(bf_editor_space_node "${SRC}" "${INC}")

source/blender/editors/space_outliner/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -31,7 +31,7 @@ SET(INC
 	../../../../intern/opennl/extern
 )
 
-SET(SRC
+set(SRC
 	outliner.c
 	outliner_ops.c
 	space_outliner.c
@@ -39,4 +39,4 @@ SET(SRC
 	outliner_intern.h
 )
 
-BLENDERLIB(bf_editor_space_outliner "${SRC}" "${INC}")
+blenderlib(bf_editor_space_outliner "${SRC}" "${INC}")

source/blender/editors/space_script/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -29,7 +29,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	script_edit.c
 	script_header.c
 	script_ops.c
@@ -38,9 +38,9 @@ SET(SRC
 	script_intern.h
 )
 
-IF(WITH_PYTHON)
+if(WITH_PYTHON)
-	LIST(APPEND INC ${PYTHON_INC} ../../python)
+	list(APPEND INC ${PYTHON_INC} ../../python)
-	ADD_DEFINITIONS(-DWITH_PYTHON)
+	add_definitions(-DWITH_PYTHON)
-ENDIF(WITH_PYTHON)
+endif()
 
-BLENDERLIB(bf_editor_space_script "${SRC}" "${INC}")
+blenderlib(bf_editor_space_script "${SRC}" "${INC}")

source/blender/editors/space_sequencer/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -31,7 +31,7 @@ SET(INC
 	../../../../intern/audaspace/intern
 )
 
-SET(SRC
+set(SRC
 	sequencer_add.c
 	sequencer_buttons.c
 	sequencer_draw.c
@@ -44,4 +44,4 @@ SET(SRC
 	sequencer_intern.h
 )
 
-BLENDERLIB(bf_editor_space_sequencer "${SRC}" "${INC}")
+blenderlib(bf_editor_space_sequencer "${SRC}" "${INC}")

source/blender/editors/space_sound/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -29,11 +29,11 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	sound_header.c
 	space_sound.c
 
 	sound_intern.h
 )
 
-BLENDERLIB(bf_editor_space_sound "${SRC}" "${INC}")
+blenderlib(bf_editor_space_sound "${SRC}" "${INC}")

source/blender/editors/space_text/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenfont
 	../../blenkernel
@@ -30,7 +30,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	space_text.c
 	text_draw.c
 	text_header.c
@@ -40,9 +40,9 @@ SET(SRC
 	text_intern.h
 )
 
-IF(WITH_PYTHON)
+if(WITH_PYTHON)
-	LIST(APPEND INC ${PYTHON_INC} ../../python)
+	list(APPEND INC ${PYTHON_INC} ../../python)
-	ADD_DEFINITIONS(-DWITH_PYTHON)
+	add_definitions(-DWITH_PYTHON)
-ENDIF(WITH_PYTHON)
+endif()
 
-BLENDERLIB(bf_editor_text "${SRC}" "${INC}")
+blenderlib(bf_editor_text "${SRC}" "${INC}")

source/blender/editors/space_time/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -29,11 +29,11 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	space_time.c
 	time_ops.c
 
 	time_intern.h
 )
 
-BLENDERLIB(bf_editor_space_time "${SRC}" "${INC}")
+blenderlib(bf_editor_space_time "${SRC}" "${INC}")

source/blender/editors/space_userpref/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -29,11 +29,11 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	space_userpref.c
 	userpref_ops.c
 
 	userpref_intern.h
 )
 
-BLENDERLIB(bf_editor_space_userpref "${SRC}" "${INC}")
+blenderlib(bf_editor_space_userpref "${SRC}" "${INC}")

source/blender/editors/space_view3d/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenfont
 	../../blenkernel
@@ -34,7 +34,7 @@ SET(INC
 	../../../../intern/smoke/extern
 )
 
-SET(SRC
+set(SRC
 	drawanimviz.c
 	drawarmature.c
 	drawmesh.c
@@ -55,11 +55,11 @@ SET(SRC
 	view3d_intern.h
 )
 
-IF(WITH_GAMEENGINE)
+if(WITH_GAMEENGINE)
-	LIST(APPEND INC ../../../kernel/gen_system)
+	list(APPEND INC ../../../kernel/gen_system)
-	ADD_DEFINITIONS(-DWITH_GAMEENGINE)
+	add_definitions(-DWITH_GAMEENGINE)
-ENDIF(WITH_GAMEENGINE)
+endif()
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
+add_definitions(-DGLEW_STATIC)
 
-BLENDERLIB(bf_editor_space_view3d "${SRC}" "${INC}")
+blenderlib(bf_editor_space_view3d "${SRC}" "${INC}")

source/blender/editors/transform/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -29,7 +29,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	transform.c
 	transform_constraints.c
 	transform_conversions.c
@@ -44,4 +44,4 @@ SET(SRC
 	transform.h
 )
 
-BLENDERLIB(bf_editor_transform "${SRC}" "${INC}")
+blenderlib(bf_editor_transform "${SRC}" "${INC}")

source/blender/editors/util/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -29,7 +29,7 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	ed_util.c
 	editmode_undo.c
 	numinput.c
@@ -82,4 +82,4 @@ SET(SRC
 	../include/UI_view2d.h
 )
 
-BLENDERLIB(bf_editor_util "${SRC}" "${INC}")
+blenderlib(bf_editor_util "${SRC}" "${INC}")

source/blender/editors/uvedit/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	../include
 	../../blenkernel
 	../../blenlib
@@ -30,7 +30,7 @@ SET(INC
 	../../../../intern/opennl/extern
 )
 
-SET(SRC
+set(SRC
 	uvedit_draw.c
 	uvedit_ops.c
 	uvedit_parametrizer.c
@@ -40,4 +40,4 @@ SET(SRC
 	uvedit_parametrizer.h
 )
 
-BLENDERLIB(bf_editor_uvedit "${SRC}" "${INC}")
+blenderlib(bf_editor_uvedit "${SRC}" "${INC}")

source/blender/gpu/CMakeLists.txt

@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	.
 	../blenlib
 	../blenkernel
@@ -36,7 +36,7 @@ SET(INC
 	../../../intern/smoke/extern
 )
 
-SET(SRC
+set(SRC
 	intern/gpu_buffers.c
 	intern/gpu_codegen.c
 	intern/gpu_draw.c
@@ -52,7 +52,7 @@ SET(SRC
 	intern/gpu_codegen.h
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
+add_definitions(-DGLEW_STATIC)
 
-BLENDERLIB(bf_gpu "${SRC}" "${INC}")
+blenderlib(bf_gpu "${SRC}" "${INC}")
 

source/blender/ikplugin/CMakeLists.txt

@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC 
+set(INC 
 	../blenlib
 	../makesdna
 	../blenkernel
@@ -33,7 +33,7 @@ SET(INC
 	../../../intern/iksolver/extern
 )
 
-SET(SRC
+set(SRC
 	intern/ikplugin_api.c
 	intern/iksolver_plugin.c
 
@@ -43,13 +43,13 @@ SET(SRC
 	intern/itasc_plugin.h
 )
 
-IF(WITH_IK_ITASC)
+if(WITH_IK_ITASC)
-	ADD_DEFINITIONS(-DWITH_IK_ITASC)
+	add_definitions(-DWITH_IK_ITASC)
-	LIST(APPEND INC ../../../extern/Eigen2)
+	list(APPEND INC ../../../extern/Eigen2)
-	LIST(APPEND INC ../../../intern/itasc)
+	list(APPEND INC ../../../intern/itasc)
-	LIST(APPEND SRC
+	list(APPEND SRC
 		./intern/itasc_plugin.cpp
 	)
-ENDIF(WITH_IK_ITASC)
+endif()
 
-BLENDERLIB(bf_ikplugin "${SRC}" "${INC}")
+blenderlib(bf_ikplugin "${SRC}" "${INC}")

source/blender/imbuf/CMakeLists.txt

@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC 
+set(INC 
 	.
 	../avi
 	../blenlib
@@ -37,7 +37,7 @@ SET(INC
 	${ZLIB_INC}
 )
 
-SET(SRC
+set(SRC
 	intern/allocimbuf.c
 	intern/anim_movie.c
 	intern/bmp.c
@@ -96,48 +96,48 @@ SET(SRC
 	intern/openexr/openexr_multi.h
 )
 
-IF(WITH_IMAGE_OPENEXR)
+if(WITH_IMAGE_OPENEXR)
-	ADD_DEFINITIONS(-DWITH_OPENEXR)
+	add_definitions(-DWITH_OPENEXR)
-ENDIF(WITH_IMAGE_OPENEXR)
+endif()
 
-IF(WITH_IMAGE_TIFF)
+if(WITH_IMAGE_TIFF)
-	LIST(APPEND INC ${TIFF_INCLUDE_DIR})
+	list(APPEND INC ${TIFF_INCLUDE_DIR})
-	ADD_DEFINITIONS(-DWITH_TIFF)
+	add_definitions(-DWITH_TIFF)
-ENDIF(WITH_IMAGE_TIFF)
+endif()
 
-IF(WITH_IMAGE_OPENJPEG)
+if(WITH_IMAGE_OPENJPEG)
-	LIST(APPEND INC ${OPENJPEG_INC})
+	list(APPEND INC ${OPENJPEG_INC})
-	ADD_DEFINITIONS(-DWITH_OPENJPEG)
+	add_definitions(-DWITH_OPENJPEG)
-ENDIF(WITH_IMAGE_OPENJPEG)
+endif()
 
-IF(WITH_IMAGE_REDCODE)
+if(WITH_IMAGE_REDCODE)
-	LIST(APPEND INC ${REDCODE_INC})
+	list(APPEND INC ${REDCODE_INC})
-	ADD_DEFINITIONS(-DWITH_REDCODE)
+	add_definitions(-DWITH_REDCODE)
-ENDIF(WITH_IMAGE_REDCODE)
+endif()
 
-IF(WITH_CODEC_QUICKTIME)
+if(WITH_CODEC_QUICKTIME)
-	LIST(APPEND INC
+	list(APPEND INC
 		../quicktime
 		${QUICKTIME_INC}
 	)
-	ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	add_definitions(-DWITH_QUICKTIME)
-ENDIF(WITH_CODEC_QUICKTIME)
+endif()
 
-IF(WITH_CODEC_FFMPEG)
+if(WITH_CODEC_FFMPEG)
-	LIST(APPEND INC ${FFMPEG_INC})
+	list(APPEND INC ${FFMPEG_INC})
-	ADD_DEFINITIONS(-DWITH_FFMPEG)
+	add_definitions(-DWITH_FFMPEG)
-ENDIF(WITH_CODEC_FFMPEG)
+endif()
 
-IF(WITH_IMAGE_DDS)
+if(WITH_IMAGE_DDS)
-	ADD_DEFINITIONS(-DWITH_DDS)
+	add_definitions(-DWITH_DDS)
-ENDIF(WITH_IMAGE_DDS)
+endif()
 
-IF(WITH_IMAGE_CINEON)
+if(WITH_IMAGE_CINEON)
-	ADD_DEFINITIONS(-DWITH_CINEON)
+	add_definitions(-DWITH_CINEON)
-ENDIF(WITH_IMAGE_CINEON)
+endif()
 
-IF(WITH_IMAGE_HDR)
+if(WITH_IMAGE_HDR)
-	ADD_DEFINITIONS(-DWITH_HDR)
+	add_definitions(-DWITH_HDR)
-ENDIF(WITH_IMAGE_HDR)
+endif()
 
-BLENDERLIB(bf_imbuf "${SRC}" "${INC}")
+blenderlib(bf_imbuf "${SRC}" "${INC}")

source/blender/imbuf/intern/cineon/CMakeLists.txt

@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC 
+set(INC 
 		.
 		..
 		../../
@@ -34,7 +34,7 @@ SET(INC
 		../../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	cineon_dpx.c
 	cineonlib.c
 	dpxlib.c
@@ -43,4 +43,4 @@ SET(SRC
 	logmemfile.c
 )
 
-BLENDERLIB(bf_imbuf_cineon "${SRC}" "${INC}")
+blenderlib(bf_imbuf_cineon "${SRC}" "${INC}")

source/blender/imbuf/intern/dds/CMakeLists.txt

@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC 
+set(INC 
 	.
 	..
 	./intern/include
@@ -35,7 +35,7 @@ SET(INC
 	../../../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	BlockDXT.cpp
 	ColorBlock.cpp
 	DirectDrawSurface.cpp
@@ -45,7 +45,7 @@ SET(SRC
 )
 
 if(WITH_IMAGE_DDS)
-	ADD_DEFINITIONS(-DWITH_DDS)
+	add_definitions(-DWITH_DDS)
-ENDIF(WITH_IMAGE_DDS)
+endif()
 
-BLENDERLIB(bf_imbuf_dds "${SRC}" "${INC}")                 
+blenderlib(bf_imbuf_dds "${SRC}" "${INC}")                 

source/blender/imbuf/intern/openexr/CMakeLists.txt

@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC 
+set(INC 
 	.
 	../../../blenkernel
 	../../
@@ -36,12 +36,12 @@ SET(INC
 	${OPENEXR_INC}
 )
 
-SET(SRC
+set(SRC
 	openexr_api.cpp
 )
 
-IF(WITH_IMAGE_OPENEXR)
+if(WITH_IMAGE_OPENEXR)
-	ADD_DEFINITIONS(-DWITH_OPENEXR)
+	add_definitions(-DWITH_OPENEXR)
-ENDIF(WITH_IMAGE_OPENEXR)
+endif()
 
-BLENDERLIB(bf_imbuf_openexr "${SRC}" "${INC}")                 
+blenderlib(bf_imbuf_openexr "${SRC}" "${INC}")                 

source/blender/makesdna/CMakeLists.txt

@@ -24,4 +24,4 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-ADD_SUBDIRECTORY(intern)
+add_subdirectory(intern)

source/blender/makesdna/intern/CMakeLists.txt

@@ -24,21 +24,21 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-INCLUDE_DIRECTORIES(../../../../intern/guardedalloc ..)
+include_directories(../../../../intern/guardedalloc ..)
 
 # Build makesdna executable
-SET(SRC
+set(SRC
 	makesdna.c
 	../../../../intern/guardedalloc/intern/mallocn.c
 )
 
-IF(WIN32 AND NOT UNIX)
+if(WIN32 AND NOT UNIX)
-	LIST(APPEND SRC
+	list(APPEND SRC
 		../../../../intern/guardedalloc/intern/mmap_win.c
 	)
-ENDIF(WIN32 AND NOT UNIX)
+endif()
 
-SET(SRC_DNA_INC
+set(SRC_DNA_INC
 	../DNA_ID.h
 	../DNA_action_types.h
 	../DNA_actuator_types.h
@@ -98,22 +98,22 @@ SET(SRC_DNA_INC
 	../DNA_world_types.h
 )
 
-ADD_EXECUTABLE(makesdna ${SRC} ${SRC_DNA_INC})
+add_executable(makesdna ${SRC} ${SRC_DNA_INC})
 
 # Output dna.c
-ADD_CUSTOM_COMMAND(
+add_custom_command(
 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c
 	COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_SOURCE_DIR}/source/blender/makesdna/
 	DEPENDS makesdna
 )
 
 # Build bf_dna library
-SET(SRC
+set(SRC
 	dna_genfile.c
 	dna.c
 	${SRC_DNA_INC}
 )
 
-BLENDERLIB(bf_dna "${SRC}" "${INC}")
+blenderlib(bf_dna "${SRC}" "${INC}")
 
-MESSAGE(STATUS "Configuring makesdna")
+message(STATUS "Configuring makesdna")

source/blender/makesrna/CMakeLists.txt

@@ -24,4 +24,4 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-ADD_SUBDIRECTORY(intern)
+add_subdirectory(intern)

source/blender/makesrna/intern/CMakeLists.txt

@@ -25,20 +25,20 @@
 # ***** END GPL LICENSE BLOCK *****
 
 # Generated code has some unused vars we can ignore.
-REMOVE_STRICT_FLAGS()
+remove_strict_flags()
 
-MESSAGE(STATUS "Configuring makesrna")
+message(STATUS "Configuring makesrna")
 
-FILE(GLOB DEFSRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.c")
+file(GLOB DEFSRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.c")
-FILE(GLOB APISRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*_api.c")
+file(GLOB APISRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*_api.c")
-LIST(REMOVE_ITEM DEFSRC rna_access.c rna_define.c makesrna.c)
+list(REMOVE_ITEM DEFSRC rna_access.c rna_define.c makesrna.c)
-LIST(REMOVE_ITEM DEFSRC ${APISRC})
+list(REMOVE_ITEM DEFSRC ${APISRC})
  
-STRING(REGEX REPLACE "rna_([a-zA-Z0-9_-]*).c" "${CMAKE_CURRENT_BINARY_DIR}/rna_\\1_gen.c" GENSRC "${DEFSRC}")
+string(REGEX REPLACE "rna_([a-zA-Z0-9_-]*).c" "${CMAKE_CURRENT_BINARY_DIR}/rna_\\1_gen.c" GENSRC "${DEFSRC}")
-SET_SOURCE_FILES_PROPERTIES(GENSRC PROPERTIES GENERATED true)
+set_source_files_properties(GENSRC PROPERTIES GENERATED true)
 
 
-SET(SRC
+set(SRC
 	makesrna.c
 	rna_define.c
 	${DEFSRC}
@@ -47,7 +47,7 @@ SET(SRC
 	../../../../intern/guardedalloc/intern/mmap_win.c
 )
 
-INCLUDE_DIRECTORIES(
+include_directories(
 	../../../../intern/audaspace/intern
 	../../../../intern/guardedalloc
 	../../../../intern/memutil
@@ -66,93 +66,93 @@ INCLUDE_DIRECTORIES(
 	.
 )
 
-FILE(GLOB INC_FILES ../*.h ../../makesdna/*.h)
+file(GLOB INC_FILES ../*.h ../../makesdna/*.h)
 
-IF(WITH_PYTHON)
+if(WITH_PYTHON)
-	ADD_DEFINITIONS(-DWITH_PYTHON)
+	add_definitions(-DWITH_PYTHON)
-ENDIF(WITH_PYTHON)
+endif()
 
-IF(WITH_GAMEENGINE)
+if(WITH_GAMEENGINE)
-	ADD_DEFINITIONS(-DWITH_GAMEENGINE)
+	add_definitions(-DWITH_GAMEENGINE)
-ENDIF(WITH_GAMEENGINE)
+endif()
 
-IF(WITH_IMAGE_OPENEXR)
+if(WITH_IMAGE_OPENEXR)
-	ADD_DEFINITIONS(-DWITH_OPENEXR)
+	add_definitions(-DWITH_OPENEXR)
-ENDIF(WITH_IMAGE_OPENEXR)
+endif()
 
-IF(WITH_IMAGE_TIFF)
+if(WITH_IMAGE_TIFF)
-	ADD_DEFINITIONS(-DWITH_TIFF)
+	add_definitions(-DWITH_TIFF)
-ENDIF(WITH_IMAGE_TIFF)
+endif()
 
-IF(WITH_IMAGE_OPENJPEG)
+if(WITH_IMAGE_OPENJPEG)
-	ADD_DEFINITIONS(-DWITH_OPENJPEG)
+	add_definitions(-DWITH_OPENJPEG)
-ENDIF(WITH_IMAGE_OPENJPEG)
+endif()
 
-IF(WITH_IMAGE_DDS)
+if(WITH_IMAGE_DDS)
-	ADD_DEFINITIONS(-DWITH_DDS)
+	add_definitions(-DWITH_DDS)
-ENDIF(WITH_IMAGE_DDS)
+endif()
 
-IF(WITH_IMAGE_CINEON)
+if(WITH_IMAGE_CINEON)
-	ADD_DEFINITIONS(-DWITH_CINEON)
+	add_definitions(-DWITH_CINEON)
-ENDIF(WITH_IMAGE_CINEON)
+endif()
 
-IF(WITH_IMAGE_HDR)
+if(WITH_IMAGE_HDR)
-	ADD_DEFINITIONS(-DWITH_HDR)
+	add_definitions(-DWITH_HDR)
-ENDIF(WITH_IMAGE_HDR)
+endif()
 
-IF(WITH_CODEC_QUICKTIME)
+if(WITH_CODEC_QUICKTIME)
-	LIST(APPEND INC ../../quicktime)
+	list(APPEND INC ../../quicktime)
-	ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	add_definitions(-DWITH_QUICKTIME)
-ENDIF(WITH_CODEC_QUICKTIME)
+endif()
 
-IF(WITH_CODEC_FFMPEG)
+if(WITH_CODEC_FFMPEG)
-	LIST(APPEND INC ${FFMPEG_INC})
+	list(APPEND INC ${FFMPEG_INC})
-	ADD_DEFINITIONS(-DWITH_FFMPEG)
+	add_definitions(-DWITH_FFMPEG)
-ENDIF(WITH_CODEC_FFMPEG)
+endif()
 
-IF(WITH_LCMS)
+if(WITH_LCMS)
-	LIST(APPEND INC ${LCMS_INCLUDE_DIR})
+	list(APPEND INC ${LCMS_INCLUDE_DIR})
-	ADD_DEFINITIONS(-DWITH_LCMS)
+	add_definitions(-DWITH_LCMS)
-ENDIF(WITH_LCMS)
+endif()
 
-IF(NOT WITH_MOD_FLUID)
+if(NOT WITH_MOD_FLUID)
-	ADD_DEFINITIONS(-DDISABLE_ELBEEM)
+	add_definitions(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_MOD_FLUID)
+endif()
 
-IF(WITH_FFTW3)
+if(WITH_FFTW3)
-	ADD_DEFINITIONS(-DFFTW3=1)
+	add_definitions(-DFFTW3=1)
-ENDIF(WITH_FFTW3)
+endif()
 
-IF(WITH_SDL)
+if(WITH_SDL)
-	ADD_DEFINITIONS(-DWITH_SDL)
+	add_definitions(-DWITH_SDL)
-ENDIF(WITH_SDL)
+endif()
 
-IF(WITH_OPENAL)
+if(WITH_OPENAL)
-	ADD_DEFINITIONS(-DWITH_OPENAL)
+	add_definitions(-DWITH_OPENAL)
-ENDIF(WITH_OPENAL)
+endif()
 
-IF(WITH_JACK)
+if(WITH_JACK)
-	ADD_DEFINITIONS(-DWITH_JACK)
+	add_definitions(-DWITH_JACK)
-ENDIF(WITH_JACK)
+endif()
 
-IF(WITH_OPENCOLLADA)
+if(WITH_OPENCOLLADA)
-	ADD_DEFINITIONS(-DWITH_COLLADA)
+	add_definitions(-DWITH_COLLADA)
-ENDIF(WITH_OPENCOLLADA)
+endif()
 
 # Build makesrna executable
-ADD_EXECUTABLE(makesrna ${SRC} ${INC_FILES})
+add_executable(makesrna ${SRC} ${INC_FILES})
-TARGET_LINK_LIBRARIES(makesrna bf_dna)
+target_link_libraries(makesrna bf_dna)
 
 # Output rna_*_gen.c
 # note (linux only): with crashes try add this after COMMAND: valgrind --leak-check=full --track-origins=yes
-ADD_CUSTOM_COMMAND(
+add_custom_command(
 	OUTPUT ${GENSRC}
 	COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesrna ${CMAKE_CURRENT_BINARY_DIR}/
 	DEPENDS makesrna
 )
 
 # Build bf_rna
-SET(SRC
+set(SRC
 	rna_access.c
 	${GENSRC}
 
@@ -166,4 +166,4 @@ SET(SRC
 	rna_nodetree_types.h
 )
 
-BLENDERLIB(bf_rna "${SRC}" "${INC}")
+blenderlib(bf_rna "${SRC}" "${INC}")

source/blender/makesrna/intern/rna_texture.c

@@ -473,7 +473,7 @@ static void rna_def_mtex(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "color", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_float_sdna(prop, NULL, "r");
 	RNA_def_property_array(prop, 3);
-	RNA_def_property_ui_text(prop, "Color", "The default color for textures that don't return RGB");
+	RNA_def_property_ui_text(prop, "Color", "The default color for textures that don't return RGB or when RGB to intensity is enabled");
 	RNA_def_property_update(prop, 0, "rna_TextureSlot_update");
 
 	prop= RNA_def_property(srna, "blend_type", PROP_ENUM, PROP_NONE);

source/blender/modifiers/CMakeLists.txt

@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC 
+set(INC 
 	. ./intern
 	../blenlib
 	../makesdna
@@ -36,7 +36,7 @@ SET(INC
 	${ZLIB_INC}
 )
 
-SET(SRC
+set(SRC
 	intern/MOD_armature.c
 	intern/MOD_array.c
 	intern/MOD_bevel.c
@@ -81,21 +81,21 @@ SET(SRC
 	intern/MOD_util.h
 )
 
-IF(WITH_MOD_BOOLEAN)
+if(WITH_MOD_BOOLEAN)
-	ADD_DEFINITIONS(-DWITH_MOD_BOOLEAN)
+	add_definitions(-DWITH_MOD_BOOLEAN)
-	LIST(APPEND SRC
+	list(APPEND SRC
 		intern/MOD_boolean_util.c
 	)
-	LIST(APPEND INC ../../../intern/bsp/extern)
+	list(APPEND INC ../../../intern/bsp/extern)
-ENDIF(WITH_MOD_BOOLEAN)
+endif()
 
-IF(WITH_MOD_DECIMATE)
+if(WITH_MOD_DECIMATE)
-	ADD_DEFINITIONS(-DWITH_MOD_DECIMATE)
+	add_definitions(-DWITH_MOD_DECIMATE)
-	LIST(APPEND INC ../../../intern/decimation/extern)
+	list(APPEND INC ../../../intern/decimation/extern)
-ENDIF(WITH_MOD_DECIMATE)
+endif()
 
-IF(NOT WITH_MOD_FLUID)
+if(NOT WITH_MOD_FLUID)
-	ADD_DEFINITIONS(-DDISABLE_ELBEEM)
+	add_definitions(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_MOD_FLUID)
+endif()
 
-BLENDERLIB(bf_modifiers "${SRC}" "${INC}")
+blenderlib(bf_modifiers "${SRC}" "${INC}")

source/blender/nodes/CMakeLists.txt

@@ -23,7 +23,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC 
+set(INC 
 	.
 	../blenkernel
 	../blenlib
@@ -37,7 +37,7 @@ SET(INC
 	../../../extern/glew/include
 )
 
-SET(SRC
+set(SRC
 	intern/CMP_nodes/CMP_alphaOver.c
 	intern/CMP_nodes/CMP_bilateralblur.c
 	intern/CMP_nodes/CMP_blur.c
@@ -148,10 +148,10 @@ SET(SRC
 	intern/node_util.h
 )
 
-IF(WITH_PYTHON)
+if(WITH_PYTHON)
-	SET(INC ${INC} ../python ${PYTHON_INC})
+	set(INC ${INC} ../python ${PYTHON_INC})
-	ADD_DEFINITIONS(-DWITH_PYTHON)
+	add_definitions(-DWITH_PYTHON)
-ENDIF(WITH_PYTHON)
+endif()
 
-BLENDERLIB(bf_nodes "${SRC}" "${INC}")
+blenderlib(bf_nodes "${SRC}" "${INC}")
 

source/blender/python/CMakeLists.txt

@@ -16,5 +16,5 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-ADD_SUBDIRECTORY(intern)
+add_subdirectory(intern)
-ADD_SUBDIRECTORY(generic)
+add_subdirectory(generic)

source/blender/python/generic/CMakeLists.txt

@@ -18,7 +18,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC 
+set(INC 
 	.
 	../../blenlib
 	../../makesdna
@@ -28,7 +28,7 @@ SET(INC
 	${PYTHON_INC}
 )
 
-SET(SRC
+set(SRC
 	IDProp.c
 	bgl.c
 	blf_api.c
@@ -57,4 +57,4 @@ SET(SRC
 	py_capi_utils.h
 )
 
-BLENDERLIB(bf_python_ext "${SRC}" "${INC}")
+blenderlib(bf_python_ext "${SRC}" "${INC}")

source/blender/python/intern/CMakeLists.txt

@@ -23,7 +23,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC 
+set(INC 
 	../
 	../../blenlib
 	../../makesdna
@@ -36,7 +36,7 @@ SET(INC
 	${PYTHON_INC}
 )
 
-SET(SRC
+set(SRC
 	bpy.c
 	bpy_app.c
 	bpy_driver.c
@@ -62,8 +62,8 @@ SET(SRC
 )
 
 # only to check if buildinfo is available
-IF(WITH_BUILDINFO)
+if(WITH_BUILDINFO)
-	ADD_DEFINITIONS(-DBUILD_DATE)
+	add_definitions(-DBUILD_DATE)
-ENDIF(WITH_BUILDINFO)
+endif()
 
-BLENDERLIB(bf_python "${SRC}" "${INC}")
+blenderlib(bf_python "${SRC}" "${INC}")

source/blender/quicktime/CMakeLists.txt

@@ -24,25 +24,25 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-IF(USE_QTKIT)
+if(USE_QTKIT)
-	SET(SRC
+	set(SRC
 		apple/qtkit_import.m
 		apple/qtkit_export.m
 
 		quicktime_export.h
 		quicktime_import.h
 	)
-ELSE(USE_QTKIT)
+else()
-	SET(SRC
+	set(SRC
 		apple/quicktime_import.c
 		apple/quicktime_export.c
 
 		quicktime_export.h
 		quicktime_import.h
 	)
-ENDIF(USE_QTKIT)
+endif()
 
-SET(INC 
+set(INC 
 	.
 	../quicktime
 	../makesdna
@@ -61,6 +61,6 @@ SET(INC
 	${QUICKTIME_INC}
 )
 
-ADD_DEFINITIONS(-DWITH_QUICKTIME)
+add_definitions(-DWITH_QUICKTIME)
 
-BLENDERLIB(bf_quicktime "${SRC}" "${INC}")
+blenderlib(bf_quicktime "${SRC}" "${INC}")

source/blender/readblenfile/CMakeLists.txt

@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC 
+set(INC 
 	.
 	../blenloader
 	../blenloader/intern
@@ -34,10 +34,10 @@ SET(INC
 	../../kernel/gen_messaging
 )
 
-SET(SRC
+set(SRC
 	intern/BLO_readblenfile.c
 
 	BLO_readblenfile.h
 )
 
-BLENDERLIB(bf_readblenfile "${SRC}" "${INC}")
+blenderlib(bf_readblenfile "${SRC}" "${INC}")

source/blender/render/CMakeLists.txt

@@ -25,9 +25,9 @@
 # ***** END GPL LICENSE BLOCK *****
 
 # remove warning until render branch merged.
-REMOVE_STRICT_FLAGS()
+remove_strict_flags()
 
-SET(INC 
+set(INC 
 	intern/include
 	extern/include
 	../blenlib
@@ -41,7 +41,7 @@ SET(INC
 	../../../intern/guardedalloc
 )
 
-SET(SRC
+set(SRC
 	intern/raytrace/rayobject.cpp
 	intern/raytrace/rayobject_qbvh.cpp
 	intern/raytrace/rayobject_rtbuild.cpp
@@ -111,20 +111,20 @@ SET(SRC
 	intern/raytrace/vbvh.h
 )
 
-IF(WITH_IMAGE_OPENEXR)
+if(WITH_IMAGE_OPENEXR)
-	ADD_DEFINITIONS(-DWITH_OPENEXR)
+	add_definitions(-DWITH_OPENEXR)
-ENDIF(WITH_IMAGE_OPENEXR)
+endif()
 
-IF(WITH_CODEC_QUICKTIME)
+if(WITH_CODEC_QUICKTIME)
-	LIST(APPEND INC ../quicktime ${QUICKTIME_INC})
+	list(APPEND INC ../quicktime ${QUICKTIME_INC})
-	ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	add_definitions(-DWITH_QUICKTIME)
-ENDIF(WITH_CODEC_QUICKTIME)
+endif()
 
-IF(APPLE)
+if(APPLE)
-	IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
+	if(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
-		SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpmath=sse")
+		set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpmath=sse")
-		SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse")
+		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse")
-	ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
+	endif()
-ENDIF(APPLE)
+endif()
 
-BLENDERLIB_NOLIST(bf_render "${SRC}" "${INC}")
+blenderlib_nolist(bf_render "${SRC}" "${INC}")

source/blender/windowmanager/CMakeLists.txt

@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	.
 	../nodes
 	../gpu
@@ -47,7 +47,7 @@ SET(INC
 	${OPENGL_INCLUDE_DIR}
 )
 
-SET(SRC
+set(SRC
 	intern/wm.c
 	intern/wm_apple.c
 	intern/wm_cursors.c
@@ -75,41 +75,41 @@ SET(SRC
 	wm_window.h
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
+add_definitions(-DGLEW_STATIC)
 
-IF(WITH_INTERNATIONAL)
+if(WITH_INTERNATIONAL)
-	ADD_DEFINITIONS(-DINTERNATIONAL)
+	add_definitions(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
+endif()
 
-IF(WITH_OPENCOLLADA)
+if(WITH_OPENCOLLADA)
-	ADD_DEFINITIONS(-DWITH_COLLADA)
+	add_definitions(-DWITH_COLLADA)
-ENDIF(WITH_OPENCOLLADA)
+endif()
 
-IF(WITH_CODEC_QUICKTIME)
+if(WITH_CODEC_QUICKTIME)
-	LIST(APPEND INC ../quicktime ${QUICKTIME_INC})
+	list(APPEND INC ../quicktime ${QUICKTIME_INC})
-	ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	add_definitions(-DWITH_QUICKTIME)
-ENDIF(WITH_CODEC_QUICKTIME)
+endif()
 
-IF(WITH_CODEC_FFMPEG)
+if(WITH_CODEC_FFMPEG)
-	LIST(APPEND INC ${FFMPEG_INC})
+	list(APPEND INC ${FFMPEG_INC})
-	ADD_DEFINITIONS(-DWITH_FFMPEG)
+	add_definitions(-DWITH_FFMPEG)
-ENDIF(WITH_CODEC_FFMPEG)
+endif()
 
-IF(WITH_PYTHON)
+if(WITH_PYTHON)
-	LIST(APPEND INC ../python ${PYTHON_INC})
+	list(APPEND INC ../python ${PYTHON_INC})
-	ADD_DEFINITIONS(-DWITH_PYTHON)
+	add_definitions(-DWITH_PYTHON)
-ENDIF(WITH_PYTHON)
+endif()
 
-IF(WITH_GAMEENGINE)
+if(WITH_GAMEENGINE)
-	ADD_DEFINITIONS(-DWITH_GAMEENGINE)
+	add_definitions(-DWITH_GAMEENGINE)
-ENDIF(WITH_GAMEENGINE)
+endif()
 
-IF(WITH_COCOA)
+if(WITH_COCOA)
-	LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/wm_apple.c")
+	list(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/wm_apple.c")
-ENDIF(WITH_COCOA)
+endif()
 
-IF(WITH_BUILDINFO)
+if(WITH_BUILDINFO)
-	ADD_DEFINITIONS(-DNAN_BUILDINFO)
+	add_definitions(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
+endif()
 
-BLENDERLIB_NOLIST(bf_windowmanager "${SRC}" "${INC}")
+blenderlib_nolist(bf_windowmanager "${SRC}" "${INC}")

source/blenderplayer/CMakeLists.txt

@@ -24,48 +24,48 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-MESSAGE(STATUS "Configuring blenderplayer")
+message(STATUS "Configuring blenderplayer")
 
-SETUP_LIBDIRS()
+setup_libdirs()
 
-IF(WITH_CODEC_QUICKTIME)
+if(WITH_CODEC_QUICKTIME)
-	ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	add_definitions(-DWITH_QUICKTIME)
-ENDIF(WITH_CODEC_QUICKTIME)
+endif()
 
-IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-	ADD_DEFINITIONS(-DWITH_BINRELOC)
+	add_definitions(-DWITH_BINRELOC)
-	INCLUDE_DIRECTORIES(${BINRELOC_INC})
+	include_directories(${BINRELOC_INC})
-ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+endif()
 
-ADD_CUSTOM_COMMAND(
+add_custom_command(
 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c
 	COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_SOURCE_DIR}/source/blender/makesdna/
 	DEPENDS ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna
 )
 
-IF(WIN32 AND NOT UNIX)
+if(WIN32 AND NOT UNIX)
-	ADD_EXECUTABLE(blenderplayer ${EXETYPE} ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../icons/winblender.rc)
+	add_executable(blenderplayer ${EXETYPE} ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../icons/winblender.rc)
-ELSE(WIN32 AND NOT UNIX)
+else()
-	ADD_EXECUTABLE(blenderplayer ${CMAKE_CURRENT_BINARY_DIR}/dna.c)
+	add_executable(blenderplayer ${CMAKE_CURRENT_BINARY_DIR}/dna.c)
-ENDIF(WIN32 AND NOT UNIX)
+endif()
 
-ADD_DEPENDENCIES(blenderplayer makesdna)
+add_dependencies(blenderplayer makesdna)
 
-GET_PROPERTY(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS)
+get_property(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS)
 
-LIST(APPEND BLENDER_LINK_LIBS
+list(APPEND BLENDER_LINK_LIBS
 	ge_player_common
 	ge_player_ghost
 	blenkernel_blc
 )
 
-IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-	LIST(APPEND BLENDER_LINK_LIBS extern_binreloc)
+	list(APPEND BLENDER_LINK_LIBS extern_binreloc)
-ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+endif()
 
-IF(UNIX)
+if(UNIX)
 	# Sort libraries
-	SET(BLENDER_SORTED_LIBS
+	set(BLENDER_SORTED_LIBS
 		ge_player_ghost 
 		ge_player_common 
 		bf_intern_string 
@@ -123,34 +123,34 @@ IF(UNIX)
 		bf_blenkernel # duplicate for linking
 	)
   
-	IF(WITH_CODEC_QUICKTIME)
+	if(WITH_CODEC_QUICKTIME)
-		LIST(APPEND BLENDER_SORTED_LIBS bf_quicktime)
+		list(APPEND BLENDER_SORTED_LIBS bf_quicktime)
-	ENDIF(WITH_CODEC_QUICKTIME)
+	endif()
 
-	IF(WITH_CXX_GUARDEDALLOC)
+	if(WITH_CXX_GUARDEDALLOC)
-		LIST(APPEND BLENDER_SORTED_LIBS bf_intern_guardedalloc_cpp)
+		list(APPEND BLENDER_SORTED_LIBS bf_intern_guardedalloc_cpp)
-	ENDIF(WITH_CXX_GUARDEDALLOC)
+	endif()
 
-	FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
+	foreach(SORTLIB ${BLENDER_SORTED_LIBS})
-		SET(REMLIB ${SORTLIB})
+		set(REMLIB ${SORTLIB})
-		FOREACH(SEARCHLIB ${BLENDER_LINK_LIBS})
+		foreach(SEARCHLIB ${BLENDER_LINK_LIBS})
-			IF(${SEARCHLIB} STREQUAL ${SORTLIB})
+			if(${SEARCHLIB} STREQUAL ${SORTLIB})
-				SET(REMLIB "")
+				set(REMLIB "")
-			ENDIF(${SEARCHLIB} STREQUAL ${SORTLIB})
+			endif()
-		ENDFOREACH(SEARCHLIB)
+		endforeach()
-		IF(REMLIB)
+		if(REMLIB)
-			MESSAGE(STATUS "Removing library ${REMLIB} from blenderplayer linking because: not configured")
+			message(STATUS "Removing library ${REMLIB} from blenderplayer linking because: not configured")
-			LIST(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
+			list(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
-		ENDIF(REMLIB)
+		endif()
-	ENDFOREACH(SORTLIB)
+	endforeach()
 
-	TARGET_LINK_LIBRARIES(blenderplayer ${BLENDER_SORTED_LIBS})
+	target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS})
-ELSE(UNIX)
+else()
-	TARGET_LINK_LIBRARIES(blenderplayer ${BLENDER_LINK_LIBS})
+	target_link_libraries(blenderplayer ${BLENDER_LINK_LIBS})
-ENDIF(UNIX)
+endif()
 
-IF(WITH_PLAYER)
+if(WITH_PLAYER)
-	ADD_SUBDIRECTORY(bad_level_call_stubs)
+	add_subdirectory(bad_level_call_stubs)
-ENDIF(WITH_PLAYER)
+endif()
 
-SETUP_LIBLINKS(blenderplayer)
+setup_liblinks(blenderplayer)

source/blenderplayer/bad_level_call_stubs/CMakeLists.txt

@@ -25,9 +25,9 @@
 # ***** END GPL LICENSE BLOCK *****
 
 # this warning on generated files gets annoying
-REMOVE_STRICT_FLAGS()
+remove_strict_flags()
 
-SET(INC 
+set(INC 
 	.
 	.. 
 	../../../intern/guardedalloc
@@ -36,23 +36,23 @@ SET(INC
 	../../../source/blender/blenkernel
 )
 
-SET(SRC
+set(SRC
 	stubs.c
 )
 
-IF(WITH_BUILDINFO)
+if(WITH_BUILDINFO)
-	ADD_DEFINITIONS(-DBUILD_DATE)
+	add_definitions(-DBUILD_DATE)
-	LIST(APPEND SRC
+	list(APPEND SRC
 		../../creator/buildinfo.c
 	)
-ENDIF(WITH_BUILDINFO)
+endif()
 
-IF(WITH_GAMEENGINE)
+if(WITH_GAMEENGINE)
-	ADD_DEFINITIONS(-DWITH_GAMEENGINE)
+	add_definitions(-DWITH_GAMEENGINE)
-ENDIF(WITH_GAMEENGINE)
+endif()
 
-IF(WITH_INTERNATIONAL)
+if(WITH_INTERNATIONAL)
-	ADD_DEFINITIONS(-DWITH_FREETYPE2)
+	add_definitions(-DWITH_FREETYPE2)
-ENDIF(WITH_INTERNATIONAL)
+endif()
 
-BLENDERLIB_NOLIST(blenkernel_blc "${SRC}" "${INC}")
+blenderlib_nolist(blenkernel_blc "${SRC}" "${INC}")

source/creator/CMakeLists.txt

@@ -25,11 +25,11 @@
 # ***** END GPL LICENSE BLOCK *****
 
 # So BUILDINFO and BLENDERPATH strings are automatically quoted
-CMAKE_POLICY(SET CMP0005 NEW)
+cmake_policy(SET CMP0005 NEW)
 
-SETUP_LIBDIRS()
+setup_libdirs()
 
-INCLUDE_DIRECTORIES(
+include_directories(
 	../../intern/guardedalloc
 	../blender/blenlib
 	../blender/blenkernel
@@ -42,69 +42,69 @@ INCLUDE_DIRECTORIES(
 	../blender/windowmanager
 )
 
-IF(WITH_CODEC_QUICKTIME)
+if(WITH_CODEC_QUICKTIME)
-	ADD_DEFINITIONS(-DWITH_QUICKTIME)
+	add_definitions(-DWITH_QUICKTIME)
-ENDIF(WITH_CODEC_QUICKTIME)
+endif()
 
-IF(WITH_IMAGE_OPENEXR)
+if(WITH_IMAGE_OPENEXR)
-	ADD_DEFINITIONS(-DWITH_OPENEXR)
+	add_definitions(-DWITH_OPENEXR)
-ENDIF(WITH_IMAGE_OPENEXR)
+endif()
 
-IF(WITH_IMAGE_TIFF)
+if(WITH_IMAGE_TIFF)
-	ADD_DEFINITIONS(-DWITH_TIFF)
+	add_definitions(-DWITH_TIFF)
-ENDIF(WITH_IMAGE_TIFF)
+endif()
 
-IF(WITH_IMAGE_DDS)
+if(WITH_IMAGE_DDS)
-	ADD_DEFINITIONS(-DWITH_DDS)
+	add_definitions(-DWITH_DDS)
-ENDIF(WITH_IMAGE_DDS)
+endif()
 
-IF(WITH_IMAGE_CINEON)
+if(WITH_IMAGE_CINEON)
-	ADD_DEFINITIONS(-DWITH_CINEON)
+	add_definitions(-DWITH_CINEON)
-ENDIF(WITH_IMAGE_CINEON)
+endif()
 
-IF(WITH_IMAGE_HDR)
+if(WITH_IMAGE_HDR)
-	ADD_DEFINITIONS(-DWITH_HDR)
+	add_definitions(-DWITH_HDR)
-ENDIF(WITH_IMAGE_HDR)
+endif()
 
-IF(WITH_PYTHON)
+if(WITH_PYTHON)
-	INCLUDE_DIRECTORIES(../blender/python)
+	include_directories(../blender/python)
-	ADD_DEFINITIONS(-DWITH_PYTHON)
+	add_definitions(-DWITH_PYTHON)
-ENDIF(WITH_PYTHON)
+endif()
 
-IF(WITH_GAMEENGINE)
+if(WITH_GAMEENGINE)
-	INCLUDE_DIRECTORIES(
+	include_directories(
 		../kernel/gen_messaging
 		../kernel/gen_system
 	)
 
-	ADD_DEFINITIONS(-DWITH_GAMEENGINE)
+	add_definitions(-DWITH_GAMEENGINE)
-ENDIF(WITH_GAMEENGINE)
+endif()
 
-IF(NOT WITH_SDL)
+if(NOT WITH_SDL)
-	ADD_DEFINITIONS(-DDISABLE_SDL)
+	add_definitions(-DDISABLE_SDL)
-ENDIF(NOT WITH_SDL)
+endif()
 
-IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-	ADD_DEFINITIONS(-DWITH_BINRELOC)
+	add_definitions(-DWITH_BINRELOC)
-	INCLUDE_DIRECTORIES(${BINRELOC_INC})
+	include_directories(${BINRELOC_INC})
-ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+endif()
 
 # Setup the exe sources and buildinfo
-SET(SRC
+set(SRC
 	creator.c
 )
 
-IF(WIN32 AND NOT UNIX)
+if(WIN32 AND NOT UNIX)
-	LIST(APPEND SRC
+	list(APPEND SRC
 		../icons/winblender.rc
 	)
-ENDIF(WIN32 AND NOT UNIX)
+endif()
 
-IF(WITH_BUILDINFO)
+if(WITH_BUILDINFO)
-	STRING(REPLACE " " "\ " BUILDINFO_CFLAGS "${CMAKE_C_FLAGS}")
+	string(REPLACE " " "\ " BUILDINFO_CFLAGS "${CMAKE_C_FLAGS}")
-	STRING(REPLACE " " "\ " BUILDINFO_CXXFLAGS "${CMAKE_CXX_FLAGS}")
+	string(REPLACE " " "\ " BUILDINFO_CXXFLAGS "${CMAKE_CXX_FLAGS}")
-	STRING(REPLACE " " "\ " BUILDINFO_LINKFLAGS "${PLATFORM_LINKFLAGS}")
+	string(REPLACE " " "\ " BUILDINFO_LINKFLAGS "${PLATFORM_LINKFLAGS}")
-	ADD_DEFINITIONS(
+	add_definitions(
 		-DBUILD_DATE="${BUILD_DATE}"
 		-DBUILD_TIME="${BUILD_TIME}"
 		-DBUILD_REV="${BUILD_REV}"
@@ -116,60 +116,60 @@ IF(WITH_BUILDINFO)
 		-DBUILD_SYSTEM="CMake"
 	)
 
-	LIST(APPEND SRC
+	list(APPEND SRC
 		buildinfo.c
 	)
-ENDIF(WITH_BUILDINFO)
+endif()
 
-MESSAGE(STATUS "Configuring blender")
+message(STATUS "Configuring blender")
 
-ADD_EXECUTABLE(blender ${EXETYPE} ${SRC})
+add_executable(blender ${EXETYPE} ${SRC})
 
 # Post build steps for bundling/packaging.
 
-SET(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
+set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
 
-IF(WITH_INSTALL)
+if(WITH_INSTALL)
 
-	IF(UNIX)
+	if(UNIX)
-		ADD_CUSTOM_COMMAND(TARGET blender
+		add_custom_command(TARGET blender
 			POST_BUILD
 			MAIN_DEPENDENCY blender
 			#COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/plugins ${TARGETDIR}/
 			#COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/text/* ${TARGETDIR}/
 		)
-	ENDIF(UNIX)
+	endif()
 
-	IF(UNIX AND NOT APPLE)
+	if(UNIX AND NOT APPLE)
 		
 		# Local installation, "make install" can be done after this optionally
 		
-		ADD_CUSTOM_COMMAND(
+		add_custom_command(
 			TARGET blender POST_BUILD MAIN_DEPENDENCY blender
 			COMMAND rm -Rf ${TARGETDIR}/${BLENDER_VERSION}
 			COMMAND mkdir ${TARGETDIR}/${BLENDER_VERSION}/
 			COMMAND cp ${CMAKE_SOURCE_DIR}/release/bin/.blender/.bfont.ttf ${TARGETDIR}/${BLENDER_VERSION}/
 		)
 	
-		IF(WITH_INTERNATIONAL)
+		if(WITH_INTERNATIONAL)
-			ADD_CUSTOM_COMMAND(
+			add_custom_command(
 				TARGET blender POST_BUILD MAIN_DEPENDENCY blender
 				COMMAND cp ${CMAKE_SOURCE_DIR}/release/bin/.blender/.Blanguages ${TARGETDIR}/${BLENDER_VERSION}/
 				COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale ${TARGETDIR}/${BLENDER_VERSION}/
 			)
-		ENDIF(WITH_INTERNATIONAL)
+		endif()
 	
-		IF(WITH_PYTHON)
+		if(WITH_PYTHON)
-			ADD_CUSTOM_COMMAND(
+			add_custom_command(
 				TARGET blender POST_BUILD MAIN_DEPENDENCY blender
 				COMMENT "copying blender scripts..."
 				COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/scripts ${TARGETDIR}/${BLENDER_VERSION}/
 				COMMAND find ${TARGETDIR} -name "*.py?" -prune -exec rm -rf {} "\;"
 			)
-			IF(WITH_PYTHON_INSTALL)
+			if(WITH_PYTHON_INSTALL)
 				# Copy the systems python into the install directory
 				# Scons copy in tools/Blender.py
-				ADD_CUSTOM_COMMAND(
+				add_custom_command(
 					TARGET blender POST_BUILD MAIN_DEPENDENCY blender
 					COMMENT "copying a subset of the systems python..."
 
@@ -191,10 +191,10 @@ IF(WITH_INSTALL)
 					COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/python${PYTHON_VERSION} -name "*.py?" -exec rm -rf {} "\;"
 					COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/python${PYTHON_VERSION} -name "*.so"-exec strip -s {} "\;"
 				)
-			ENDIF(WITH_PYTHON_INSTALL)
+			endif()
-		ENDIF(WITH_PYTHON)
+		endif()
 	  
-		ADD_CUSTOM_COMMAND(
+		add_custom_command(
 			TARGET blender POST_BUILD MAIN_DEPENDENCY blender
 			COMMAND find ${TARGETDIR} -name .svn -prune -exec rm -rf {} "\;"
 		)
@@ -202,63 +202,63 @@ IF(WITH_INSTALL)
 	
 		# Above we bundle a portable distribution in ./bin
 		# This is an optional "make install" which installs blender on the system.
-		INSTALL(
+		install(
 			PROGRAMS ${TARGETDIR}/blender
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 		)
 
-		IF(WITH_GAMEENGINE AND WITH_PLAYER)
+		if(WITH_GAMEENGINE AND WITH_PLAYER)
-			INSTALL(
+			install(
 				PROGRAMS ${TARGETDIR}/blenderplayer
 				DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 			)
-		ENDIF(WITH_GAMEENGINE AND WITH_PLAYER)
+		endif()
 
-		INSTALL(
+		install(
 			FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
 		)
-		INSTALL(
+		install(
 			FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/blender.svg
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps
 		)
-		INSTALL(
+		install(
 			PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 		)
-		INSTALL(
+		install(
 			FILES ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
 		)
-		INSTALL(
+		install(
 			DIRECTORY ${CMAKE_SOURCE_DIR}/release/text/
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender
 			PATTERN ".svn" EXCLUDE
 		)
-		INSTALL(
+		install(
 			DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts/
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION}/scripts
 			PATTERN ".svn" EXCLUDE
 			PATTERN "*.pyc" EXCLUDE
 		)
-		INSTALL(
+		install(
 			DIRECTORY ${CMAKE_SOURCE_DIR}/release/datafiles/brushicons/
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION}/datafiles/brushicons
 			PATTERN ".svn" EXCLUDE
 		)
-		IF(WITH_INTERNATIONAL)
+		if(WITH_INTERNATIONAL)
-			INSTALL(
+			install(
 				DIRECTORY ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale/
 				DESTINATION ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION}/datafiles/locale
 				PATTERN ".svn" EXCLUDE
 			)
-		ENDIF(WITH_INTERNATIONAL)
+		endif()
 		
 		# end "make install"
 	
-	ELSEIF(WIN32)
+	elseif(WIN32)
 		# notice 'xcopy /Y /H' on .bfont.ttf, this is needed when building over samba
-		ADD_CUSTOM_COMMAND(TARGET blender
+		add_custom_command(TARGET blender
 			POST_BUILD
 			MAIN_DEPENDENCY blender
 			COMMAND if not exist \"${TARGETDIR}\\${BLENDER_VERSION}\" mkdir \"${TARGETDIR}\\${BLENDER_VERSION}\"
@@ -271,41 +271,41 @@ IF(WITH_INSTALL)
 			COMMAND copy /Y \"${CMAKE_SOURCE_DIR}\\release\\text\\*.*\" \"${TARGETDIR}\\\"
 		)
 	
-		IF(CMAKE_CL_64)
+		if(CMAKE_CL_64)
 			# gettext and png are statically linked on win64
-			ADD_CUSTOM_COMMAND(TARGET blender
+			add_custom_command(TARGET blender
 				POST_BUILD
 				MAIN_DEPENDENCY blender
 				COMMAND copy /Y \"${LIBDIR}\\zlib\\lib\\zlib.dll\" \"${TARGETDIR}\\\"
 			)
-		ELSE(CMAKE_CL_64)
+		else()
-			ADD_CUSTOM_COMMAND(TARGET blender
+			add_custom_command(TARGET blender
 				POST_BUILD
 				MAIN_DEPENDENCY blender
 				COMMAND copy /Y \"${LIBDIR}\\gettext\\lib\\gnu_gettext.dll\" \"${TARGETDIR}\\\"
 				COMMAND copy /Y \"${LIBDIR}\\png\\lib\\libpng.dll\" \"${TARGETDIR}\\\"
 				COMMAND copy /Y \"${LIBDIR}\\zlib\\lib\\zlib.dll\" \"${TARGETDIR}\\\"
 			)
-		ENDIF(CMAKE_CL_64)
+		endif()
 		
 		
-		IF(MSVC)
+		if(MSVC)
-			ADD_CUSTOM_COMMAND(TARGET blender
+			add_custom_command(TARGET blender
 				POST_BUILD
 				MAIN_DEPENDENCY blender
 				COMMAND copy /Y \"${LIBDIR}\\pthreads\\lib\\pthreadVC2.dll\" \"${TARGETDIR}\\\"
 			)
-		ELSE(MSVC)
+		else()
-			ADD_CUSTOM_COMMAND(TARGET blender
+			add_custom_command(TARGET blender
 				POST_BUILD
 				MAIN_DEPENDENCY blender
 				COMMAND copy /Y \"${LIBDIR}\\pthreads\\lib\\pthreadGC2.dll\" \"${TARGETDIR}\\\"
 			)
-		ENDIF(MSVC)
+		endif()
 
-		IF(WITH_PYTHON)
+		if(WITH_PYTHON)
-			IF(NOT CMAKE_BUILD_TYPE) # hack: with multi-configuration generator this is "", so for now copy both python31.dll/zip and python31_d.dll/zip
+			if(NOT CMAKE_BUILD_TYPE) # hack: with multi-configuration generator this is "", so for now copy both python31.dll/zip and python31_d.dll/zip
-				ADD_CUSTOM_COMMAND(TARGET blender
+				add_custom_command(TARGET blender
 					POST_BUILD
 					MAIN_DEPENDENCY blender
 					COMMAND if not exist \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\" mkdir \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\"
@@ -320,37 +320,37 @@ IF(WITH_INSTALL)
 					COMMAND if \"$(ConfigurationName)\" == \"MinSizeRel\" copy /Y \"${LIBDIR}\\python\\lib\\python31.dll\" \"${TARGETDIR}\\\"
 					COMMAND if \"$(ConfigurationName)\" == \"MinSizeRel\" xcopy /E /Y \"${LIBDIR}\\release\\python31\\*.*\" \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\\\"
 				)
-			ELSE(NOT CMAKE_BUILD_TYPE)
+			else()
-				IF(CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
+				if(CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
-					ADD_CUSTOM_COMMAND(TARGET blender
+					add_custom_command(TARGET blender
 						POST_BUILD
 						MAIN_DEPENDENCY blender
 						COMMAND copy /Y \"${LIBDIR}\\python\\lib\\python31_d.dll\" \"${TARGETDIR}\\\"
 						COMMAND xcopy /E /Y \"${LIBDIR}\\release\\python31_d\\*.*\" \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\\\"
 					)
-				ELSE(CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
+				else()
-					ADD_CUSTOM_COMMAND(TARGET blender
+					add_custom_command(TARGET blender
 						POST_BUILD
 						MAIN_DEPENDENCY blender
 						COMMAND copy /Y \"${LIBDIR}\\python\\lib\\python31.dll\" \"${TARGETDIR}\\\"
 						COMMAND xcopy /E /Y \"${LIBDIR}\\release\\python31\\*.*\" \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\\\"
 					)
-				ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
+				endif()
-			ENDIF(NOT CMAKE_BUILD_TYPE)
+			endif()
-		ENDIF(WITH_PYTHON)
+		endif()
 
-		IF(WITH_INTERNATIONAL)
+		if(WITH_INTERNATIONAL)
-			IF(CMAKE_CL_64)
+			if(CMAKE_CL_64)
 				# iconv is statically linked on win64
-				ADD_CUSTOM_COMMAND(TARGET blender
+				add_custom_command(TARGET blender
 					POST_BUILD
 					MAIN_DEPENDENCY blender
 					COMMAND if not exist \"${TARGETDIR}\\${BLENDER_VERSION}\\config\\locale\" mkdir \"${TARGETDIR}\\${BLENDER_VERSION}\\config\\locale\"
 					COMMAND copy /Y \"${CMAKE_SOURCE_DIR}\\release\\bin\\.blender\\.Blanguages\" \"${TARGETDIR}\\${BLENDER_VERSION}\\config\\\" 
 					COMMAND xcopy /E /Y \"${CMAKE_SOURCE_DIR}\\release\\bin\\.blender\\locale\\*.*\" \"${TARGETDIR}\\${BLENDER_VERSION}\\config\\locale\\\"
 				)
-			ELSE(CMAKE_CL_64)
+			else()
-				ADD_CUSTOM_COMMAND(TARGET blender
+				add_custom_command(TARGET blender
 					POST_BUILD
 					MAIN_DEPENDENCY blender
 					COMMAND copy /Y \"${LIBDIR}\\iconv\\lib\\iconv.dll\" \"${TARGETDIR}\\\"
@@ -358,11 +358,11 @@ IF(WITH_INSTALL)
 					COMMAND copy /Y \"${CMAKE_SOURCE_DIR}\\release\\bin\\.blender\\.Blanguages\" \"${TARGETDIR}\\${BLENDER_VERSION}\\config\\\" 
 					COMMAND xcopy /E /Y \"${CMAKE_SOURCE_DIR}\\release\\bin\\.blender\\locale\\*.*\" \"${TARGETDIR}\\${BLENDER_VERSION}\\config\\locale\\\"
 				)
-			ENDIF(CMAKE_CL_64)
+			endif()
-		ENDIF(WITH_INTERNATIONAL)
+		endif()
 
-		IF(WITH_CODEC_FFMPEG)
+		if(WITH_CODEC_FFMPEG)
-			ADD_CUSTOM_COMMAND(TARGET blender
+			add_custom_command(TARGET blender
 				POST_BUILD
 				MAIN_DEPENDENCY blender
 				COMMAND copy /Y \"${LIBDIR}\\ffmpeg\\lib\\avcodec-52.dll\" \"${TARGETDIR}\\\"
@@ -371,50 +371,50 @@ IF(WITH_INSTALL)
 				COMMAND copy /Y \"${LIBDIR}\\ffmpeg\\lib\\avutil-50.dll\" \"${TARGETDIR}\\\"
 				COMMAND copy /Y \"${LIBDIR}\\ffmpeg\\lib\\swscale-0.dll\" \"${TARGETDIR}\\\"
 			)
-		ENDIF(WITH_CODEC_FFMPEG)
+		endif()
 
-		IF(WITH_CODEC_SNDFILE)
+		if(WITH_CODEC_SNDFILE)
-			ADD_CUSTOM_COMMAND(TARGET blender
+			add_custom_command(TARGET blender
 				POST_BUILD
 				MAIN_DEPENDENCY blender
 				COMMAND copy /Y \"${LIBDIR}\\sndfile\\lib\\libsndfile-1.dll\" \"${TARGETDIR}\\\"
 			)
-		ENDIF(WITH_CODEC_SNDFILE)
+		endif()
 
-		IF(WITH_JACK)
+		if(WITH_JACK)
-			ADD_CUSTOM_COMMAND(TARGET blender
+			add_custom_command(TARGET blender
 				POST_BUILD
 				MAIN_DEPENDENCY blender
 				COMMAND copy /Y \"${LIBDIR}\\jack\\lib\\libjack.dll\" \"${TARGETDIR}\\\"
 			)
-		ENDIF(WITH_JACK)
+		endif()
 
-		IF(WITH_OPENAL)
+		if(WITH_OPENAL)
-			ADD_CUSTOM_COMMAND(TARGET blender
+			add_custom_command(TARGET blender
 				POST_BUILD
 				MAIN_DEPENDENCY blender
 				COMMAND copy /Y \"${LIBDIR}\\openal\\lib\\OpenAL32.dll\" \"${TARGETDIR}\\\"
 				COMMAND copy /Y \"${LIBDIR}\\openal\\lib\\wrap_oal.dll\" \"${TARGETDIR}\\\"
 
 			)
-		ENDIF(WITH_OPENAL)
+		endif()
 
-		IF(WITH_SDL)
+		if(WITH_SDL)
-			IF(NOT CMAKE_CL_64)
+			if(NOT CMAKE_CL_64)
-				ADD_CUSTOM_COMMAND(TARGET blender
+				add_custom_command(TARGET blender
 					POST_BUILD
 					MAIN_DEPENDENCY blender
 					COMMAND copy /Y \"${LIBDIR}\\sdl\\lib\\SDL.dll\" \"${TARGETDIR}\\\"
 				)
-			ENDIF(NOT CMAKE_CL_64)
+			endif()
-		ENDIF(WITH_SDL)
+		endif()
 
-	ELSEIF(APPLE)
+	elseif(APPLE)
-		SET(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
+		set(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
-		SET(SOURCEINFO ${SOURCEDIR}/Contents/Info.plist)
+		set(SOURCEINFO ${SOURCEDIR}/Contents/Info.plist)
-		SET(TARGETINFO ${TARGETDIR}/blender.app/Contents/Info.plist)
+		set(TARGETINFO ${TARGETDIR}/blender.app/Contents/Info.plist)
 
-		ADD_CUSTOM_COMMAND(
+		add_custom_command(
 			TARGET blender POST_BUILD MAIN_DEPENDENCY blender
 			COMMAND cp -Rf ${SOURCEINFO} ${TARGETDIR}/blender.app/Contents/
 			COMMAND cp -Rf ${SOURCEDIR}/Contents/PkgInfo ${TARGETDIR}/blender.app/Contents/
@@ -426,49 +426,49 @@ IF(WITH_INSTALL)
 			COMMAND cp ${CMAKE_SOURCE_DIR}/release/bin/.blender/.bfont.ttf ${TARGETDIR}/blender.app/Contents/MacOS/${BLENDER_VERSION}/datafiles/
 		)
 	  
-		IF(WITH_INTERNATIONAL)
+		if(WITH_INTERNATIONAL)
-			ADD_CUSTOM_COMMAND(
+			add_custom_command(
 				TARGET blender POST_BUILD MAIN_DEPENDENCY blender
 				COMMAND cp ${CMAKE_SOURCE_DIR}/release/bin/.blender/.Blanguages ${TARGETDIR}/blender.app/Contents/MacOS/${BLENDER_VERSION}/datafiles/
 				COMMAND cp -Rf ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale ${TARGETDIR}/blender.app/Contents/MacOS/${BLENDER_VERSION}/datafiles/
 			)
-		ENDIF(WITH_INTERNATIONAL)
+		endif()
 	  
-		IF(WITH_PYTHON)
+		if(WITH_PYTHON)
-			SET(PYTHON_ZIP "python_${CMAKE_OSX_ARCHITECTURES}.zip")
+			set(PYTHON_ZIP "python_${CMAKE_OSX_ARCHITECTURES}.zip")
-			ADD_CUSTOM_COMMAND(
+			add_custom_command(
 				TARGET blender POST_BUILD MAIN_DEPENDENCY blender
 				COMMAND cp -Rf ${CMAKE_SOURCE_DIR}/release/scripts ${TARGETDIR}/blender.app/Contents/MacOS/${BLENDER_VERSION}/
 				COMMAND mkdir ${TARGETDIR}/blender.app/Contents/MacOS/${BLENDER_VERSION}/python/
 				COMMAND unzip -q ${LIBDIR}/release/${PYTHON_ZIP} -d ${TARGETDIR}/blender.app/Contents/MacOS/${BLENDER_VERSION}/python/
 				COMMAND find ${TARGETDIR}/blender.app -name "*.py?" -prune -exec rm -rf {} "\;"
 			)
-		ENDIF(WITH_PYTHON)	  
+		endif()	  
 	
-		ADD_CUSTOM_COMMAND(
+		add_custom_command(
 			TARGET blender POST_BUILD MAIN_DEPENDENCY blender	
 			COMMAND find ${TARGETDIR}/blender.app -name .DS_Store -prune -exec rm -rf {} "\;"
 			COMMAND find ${TARGETDIR}/blender.app -name .svn -prune -exec rm -rf {} "\;"
 					COMMAND find ${TARGETDIR}/blender.app -name __MACOSX -prune -exec rm -rf {} "\;"
 		)
-	ENDIF(UNIX AND NOT APPLE)
+	endif()
 
-ENDIF(WITH_INSTALL)
+endif()
 
-ADD_DEPENDENCIES(blender makesdna)
+add_dependencies(blender makesdna)
 
-GET_PROPERTY(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS)
+get_property(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS)
 
-SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager bf_render)
+set(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager bf_render)
 
-IF(WITH_MOD_FLUID)
+if(WITH_MOD_FLUID)
-	LIST(APPEND BLENDER_LINK_LIBS bf_intern_elbeem)
+	list(APPEND BLENDER_LINK_LIBS bf_intern_elbeem)
-ENDIF(WITH_MOD_FLUID)
+endif()
 
 
-#IF(UNIX)
+#if(UNIX)
 	# Sort libraries
-	SET(BLENDER_SORTED_LIBS
+	set(BLENDER_SORTED_LIBS
 		bf_windowmanager
 
 		bf_editor_space_api
@@ -570,38 +570,38 @@ ENDIF(WITH_MOD_FLUID)
 		bf_intern_audaspace
 	)
 
-	IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+	if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-		LIST(APPEND BLENDER_SORTED_LIBS extern_binreloc)
+		list(APPEND BLENDER_SORTED_LIBS extern_binreloc)
-	ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+	endif()
 
-	IF(WITH_CXX_GUARDEDALLOC)
+	if(WITH_CXX_GUARDEDALLOC)
-		LIST(APPEND BLENDER_SORTED_LIBS bf_intern_guardedalloc_cpp)
+		list(APPEND BLENDER_SORTED_LIBS bf_intern_guardedalloc_cpp)
-	ENDIF(WITH_CXX_GUARDEDALLOC)
+	endif()
 
-	IF(WITH_IK_ITASC)
+	if(WITH_IK_ITASC)
-		LIST(APPEND BLENDER_SORTED_LIBS bf_intern_itasc)
+		list(APPEND BLENDER_SORTED_LIBS bf_intern_itasc)
-	ENDIF(WITH_IK_ITASC)
+	endif()
 
-	IF(WITH_CODEC_QUICKTIME)
+	if(WITH_CODEC_QUICKTIME)
-		LIST(APPEND BLENDER_SORTED_LIBS bf_quicktime)
+		list(APPEND BLENDER_SORTED_LIBS bf_quicktime)
-	ENDIF(WITH_CODEC_QUICKTIME)
+	endif()
 
 
-	FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
+	foreach(SORTLIB ${BLENDER_SORTED_LIBS})
-		SET(REMLIB ${SORTLIB})
+		set(REMLIB ${SORTLIB})
-		FOREACH(SEARCHLIB ${BLENDER_LINK_LIBS})
+		foreach(SEARCHLIB ${BLENDER_LINK_LIBS})
-			IF(${SEARCHLIB} STREQUAL ${SORTLIB})
+			if(${SEARCHLIB} STREQUAL ${SORTLIB})
-				SET(REMLIB "")
+				set(REMLIB "")
-			ENDIF(${SEARCHLIB} STREQUAL ${SORTLIB})
+			endif()
-		ENDFOREACH(SEARCHLIB)
+		endforeach()
-		IF(REMLIB)
+		if(REMLIB)
-			MESSAGE(STATUS "Removing library ${REMLIB} from blender linking because: not configured")
+			message(STATUS "Removing library ${REMLIB} from blender linking because: not configured")
-			LIST(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
+			list(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
-		ENDIF(REMLIB)
+		endif()
-	ENDFOREACH(SORTLIB)
+	endforeach()
-	TARGET_LINK_LIBRARIES(blender ${BLENDER_SORTED_LIBS})
+	target_link_libraries(blender ${BLENDER_SORTED_LIBS})
-#ELSE(UNIX)
+#else()
-#	TARGET_LINK_LIBRARIES(blender ${BLENDER_LINK_LIBS})
+#	target_link_libraries(blender ${BLENDER_LINK_LIBS})
-#ENDIF(UNIX)
+#endif()
 
-SETUP_LIBLINKS(blender)
+setup_liblinks(blender)