minor changes

- remove some warnings
- fix typos
- cmake allow in-source build (when WITH_IN_SOURCE_BUILD is defined)
- cmake, use an explicit list of rna files (don't glob)

1 files changed, 14 insertions, 9 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74fbff513c1..3711227fdef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,15 +31,20 @@
 # build the libs and objects in it.
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-message(FATAL_ERROR "CMake generation for blender is not allowed within the source directory! 
-Remove the CMakeCache.txt file and try again from another folder, e.g.: 
-
-	rm CMakeCache.txt 
-	cd ..
-	mkdir cmake-make 
-	cd cmake-make
-	cmake ../blender
-")
+	if(NOT DEFINED WITH_IN_SOURCE_BUILD)
+		message(FATAL_ERROR
+			"CMake generation for blender is not allowed within the source directory!"
+			"\n Remove the CMakeCache.txt file and try again from another folder, e.g.:"
+			"\n "
+			"\n rm CMakeCache.txt"
+			"\n cd .."
+			"\n mkdir cmake-make"
+			"\n cd cmake-make"
+			"\n cmake ../blender"
+			"\n "
+			"\n Alternately define WITH_IN_SOURCE_BUILD to force this option (not recommended!)"
+		)
+	endif()
 endif()
 
 cmake_minimum_required(VERSION 2.8)