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

13 files changed, 119 insertions, 119 deletions

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 72a290d4e10..cdbfa3e0dff 100644
--- a/extern/CMakeLists.txt
+++ b/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)
-	ADD_SUBDIRECTORY(bullet2)
-ENDIF(WITH_BULLET)
+if(WITH_BULLET)
+	add_subdirectory(bullet2)
+endif()
 
-IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-	ADD_SUBDIRECTORY(binreloc)
-ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+	add_subdirectory(binreloc)
+endif()
 
-ADD_SUBDIRECTORY(glew)
+add_subdirectory(glew)
 
-IF(WITH_IMAGE_OPENJPEG)
-	ADD_SUBDIRECTORY(libopenjpeg)
-ENDIF(WITH_IMAGE_OPENJPEG)
+if(WITH_IMAGE_OPENJPEG)
+	add_subdirectory(libopenjpeg)
+endif()
 
-IF(WITH_IMAGE_REDCODE)
-	ADD_SUBDIRECTORY(libredcode)
-ENDIF(WITH_IMAGE_REDCODE)
+if(WITH_IMAGE_REDCODE)
+	add_subdirectory(libredcode)
+endif()
 
-IF(WITH_LZO)
-	ADD_SUBDIRECTORY(lzo)
-ENDIF(WITH_LZO)
+if(WITH_LZO)
+	add_subdirectory(lzo)
+endif()
 
-IF(WITH_LZMA)
-	ADD_SUBDIRECTORY(lzma)
-ENDIF(WITH_LZMA)
+if(WITH_LZMA)
+	add_subdirectory(lzma)
+endif()
diff --git a/extern/binreloc/CMakeLists.txt b/extern/binreloc/CMakeLists.txt
index a8d5ecd8a77..d0bba4c3cf9 100644
--- a/extern/binreloc/CMakeLists.txt
+++ b/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}")
diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt
index ace5e988123..278a7d46e54 100644
--- a/extern/bullet2/CMakeLists.txt
+++ b/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}")
diff --git a/extern/bullet2/src/BulletCollision/CMakeLists.txt b/extern/bullet2/src/BulletCollision/CMakeLists.txt
index ddc806a3e6a..c3c0224c8a3 100644
--- a/extern/bullet2/src/BulletCollision/CMakeLists.txt
+++ b/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)
-	TARGET_LINK_LIBRARIES(BulletCollision LinearMath)
-ENDIF (BUILD_SHARED_LIBS)
+if(BUILD_SHARED_LIBS)
+	target_link_libraries(BulletCollision LinearMath)
+endif()
 
 #INSTALL of other files requires CMake 2.6
-IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
-	INSTALL(TARGETS BulletCollision DESTINATION lib)
-				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
-ENDIF (${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(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+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 ${CollisionDispatch_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/CollisionDispatch)
-	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 ${NarrowPhaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/NarrowPhaseCollision)
+	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 ${CollisionShapes_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/CollisionShapes)
+	set_property(SOURCE ${Gimpact_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Gimpact)
+	set_property(SOURCE ${NarrowPhaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/NarrowPhaseCollision)
 
-ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+endif()
diff --git a/extern/bullet2/src/BulletDynamics/CMakeLists.txt b/extern/bullet2/src/BulletDynamics/CMakeLists.txt
index ecfcbfef929..f605e6272f3 100644
--- a/extern/bullet2/src/BulletDynamics/CMakeLists.txt
+++ b/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)
-	TARGET_LINK_LIBRARIES(BulletDynamics BulletCollision LinearMath)
-ENDIF (BUILD_SHARED_LIBS)
+if(BUILD_SHARED_LIBS)
+	target_link_libraries(BulletDynamics BulletCollision LinearMath)
+endif()
 
-IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
-	INSTALL(TARGETS BulletDynamics DESTINATION lib)
-	INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
-ENDIF (${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(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+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 ${Dynamics_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Dynamics)
-	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 ${ConstraintSolver_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/ConstraintSolver)
+	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 ${Character_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Character)
 		
-ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+endif()
diff --git a/extern/bullet2/src/BulletSoftBody/CMakeLists.txt b/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
index fe31d2bee71..16fc86f4c56 100644
--- a/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
+++ b/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)
-	TARGET_LINK_LIBRARIES(BulletSoftBody BulletDynamics)
-ENDIF (BUILD_SHARED_LIBS)
+if(BUILD_SHARED_LIBS)
+	target_link_libraries(BulletSoftBody BulletDynamics)
+endif()
 
-IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
-	INSTALL(TARGETS BulletSoftBody DESTINATION lib)
-				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
-ENDIF (${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(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+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()
diff --git a/extern/bullet2/src/CMakeLists.txt b/extern/bullet2/src/CMakeLists.txt
index 9b8a5a7e00e..6c9b6b0127b 100644
--- a/extern/bullet2/src/CMakeLists.txt
+++ b/extern/bullet2/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-ADD_SUBDIRECTORY(BulletCollision)
-ADD_SUBDIRECTORY(BulletDynamics)
-ADD_SUBDIRECTORY(LinearMath)
-ADD_SUBDIRECTORY(BulletSoftBody )
+add_subdirectory(BulletCollision)
+add_subdirectory(BulletDynamics)
+add_subdirectory(LinearMath)
+add_subdirectory(BulletSoftBody )
diff --git a/extern/bullet2/src/LinearMath/CMakeLists.txt b/extern/bullet2/src/LinearMath/CMakeLists.txt
index 99d5a6a2fef..acd3dbc406d 100644
--- a/extern/bullet2/src/LinearMath/CMakeLists.txt
+++ b/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)
-	INSTALL(TARGETS LinearMath DESTINATION lib)
-	INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
-ENDIF (${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(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+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()
diff --git a/extern/glew/CMakeLists.txt b/extern/glew/CMakeLists.txt
index 7bd766d465d..82778fd13fb 100644
--- a/extern/glew/CMakeLists.txt
+++ b/extern/glew/CMakeLists.txt
@@ -24,15 +24,15 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC
+set(INC
 	./include
 )
 
-IF(UNIX)
-	LIST(APPEND INC ${X11_X11_INCLUDE_PATH})
-ENDIF(UNIX)
+if(UNIX)
+	list(APPEND INC ${X11_X11_INCLUDE_PATH})
+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}")
diff --git a/extern/libopenjpeg/CMakeLists.txt b/extern/libopenjpeg/CMakeLists.txt
index d6e98e9a390..f52c48264b6 100644
--- a/extern/libopenjpeg/CMakeLists.txt
+++ b/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}")
diff --git a/extern/libredcode/CMakeLists.txt b/extern/libredcode/CMakeLists.txt
index b094a359b03..269de031f90 100644
--- a/extern/libredcode/CMakeLists.txt
+++ b/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}")
diff --git a/extern/lzma/CMakeLists.txt b/extern/lzma/CMakeLists.txt
index e04d3e1bd3b..8a4cf166b2d 100644
--- a/extern/lzma/CMakeLists.txt
+++ b/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}")
diff --git a/extern/lzo/CMakeLists.txt b/extern/lzo/CMakeLists.txt
index 7724711a3e5..3c68d64d181 100644
--- a/extern/lzo/CMakeLists.txt
+++ b/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}")