[Bf-blender-cvs] [a7ac648] master: CMake: report messages as status (else ccmake treats like an error)

[Campbell Barton]

Commit: a7ac6481ef72d8968445146f348d6d10aa70163e
Author: Campbell Barton
Date:   Tue Dec 10 13:18:46 2013 +1100
http://developer.blender.org/rBa7ac6481ef72d8968445146f348d6d10aa70163e

CMake: report messages as status (else ccmake treats like an error)

===================================================================

M	build_files/cmake/buildinfo.cmake
M	build_files/cmake/packaging.cmake
M	extern/libmv/third_party/ceres/CMakeLists.txt
M	extern/libmv/third_party/ceres/bundle.sh

===================================================================

diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake
index fc5cb01..9b8f935 100644
--- a/build_files/cmake/buildinfo.cmake
+++ b/build_files/cmake/buildinfo.cmake
@@ -12,7 +12,7 @@ if(EXISTS ${SOURCE_DIR}/.git)
 	# The FindGit.cmake module is part of the standard distribution
 	include(FindGit)
 	if(GIT_FOUND)
-		message("-- Found Git: ${GIT_EXECUTABLE}")
+		message(STATUS "-- Found Git: ${GIT_EXECUTABLE}")
 
 		execute_process(COMMAND git rev-parse --short @{u}
 		                WORKING_DIRECTORY ${SOURCE_DIR}
diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake
index 1484836..ad309b0 100644
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -24,7 +24,7 @@ set(MY_WC_HASH "unknown")
 if(EXISTS ${CMAKE_SOURCE_DIR}/.git/)
 	include(FindGit)
 	if(GIT_FOUND)
-		message("-- Found Git: ${GIT_EXECUTABLE}")
+		message(STATUS "-- Found Git: ${GIT_EXECUTABLE}")
 		execute_process(COMMAND git rev-parse --short @{u}
 		                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 		                OUTPUT_VARIABLE MY_WC_HASH
diff --git a/extern/libmv/third_party/ceres/CMakeLists.txt b/extern/libmv/third_party/ceres/CMakeLists.txt
index 5a1a2d6..52e2246 100644
--- a/extern/libmv/third_party/ceres/CMakeLists.txt
+++ b/extern/libmv/third_party/ceres/CMakeLists.txt
@@ -329,8 +329,8 @@ if(HAVE_STD_UNORDERED_MAP_HEADER)
 	                          }"
 	                          HAVE_UNURDERED_MAP_IN_STD_NAMESPACE)
 	if(HAVE_UNURDERED_MAP_IN_STD_NAMESPACE)
-		ADD_DEFINITIONS(-DCERES_STD_UNORDERED_MAP)
-		MESSAGE("-- Found unordered_map/set in std namespace.")
+		add_definitions(-DCERES_STD_UNORDERED_MAP)
+		message(STATUS "Found unordered_map/set in std namespace.")
 	else()
 		CHECK_CXX_SOURCE_COMPILES("#include <unordered_map>
 		                          int main() {
@@ -339,24 +339,24 @@ if(HAVE_STD_UNORDERED_MAP_HEADER)
 		                          }"
 		                          HAVE_UNURDERED_MAP_IN_TR1_NAMESPACE)
 		if(HAVE_UNURDERED_MAP_IN_TR1_NAMESPACE)
-			ADD_DEFINITIONS(-DCERES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE)
-			MESSAGE("-- Found unordered_map/set in std::tr1 namespace.")
+			add_definitions(-DCERES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE)
+			message(STATUS "Found unordered_map/set in std::tr1 namespace.")
 		else()
-			MESSAGE("-- Found <unordered_map> but cannot find either std::unordered_map "
+			message(STATUS "Found <unordered_map> but cannot find either std::unordered_map "
 			        "or std::tr1::unordered_map.")
-			MESSAGE("-- Replacing unordered_map/set with map/set (warning: slower!)")
-			ADD_DEFINITIONS(-DCERES_NO_UNORDERED_MAP)
+			message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)")
+			add_definitions(-DCERES_NO_UNORDERED_MAP)
 		endif()
 	endif()
 else()
 	CHECK_INCLUDE_FILE_CXX("tr1/unordered_map" UNORDERED_MAP_IN_TR1_NAMESPACE)
 	if(UNORDERED_MAP_IN_TR1_NAMESPACE)
-		ADD_DEFINITIONS(-DCERES_TR1_UNORDERED_MAP)
-		MESSAGE("-- Found unordered_map/set in std::tr1 namespace.")
+		add_definitions(-DCERES_TR1_UNORDERED_MAP)
+		message(STATUS "Found unordered_map/set in std::tr1 namespace.")
 	else()
-		MESSAGE("-- Unable to find <unordered_map> or <tr1/unordered_map>. ")
-		MESSAGE("-- Replacing unordered_map/set with map/set (warning: slower!)")
-		ADD_DEFINITIONS(-DCERES_NO_UNORDERED_MAP)
+		message(STATUS "Unable to find <unordered_map> or <tr1/unordered_map>. ")
+		message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)")
+		add_definitions(-DCERES_NO_UNORDERED_MAP)
 	endif()
 endif()
 
diff --git a/extern/libmv/third_party/ceres/bundle.sh b/extern/libmv/third_party/ceres/bundle.sh
index 7505758..d937ed4 100755
--- a/extern/libmv/third_party/ceres/bundle.sh
+++ b/extern/libmv/third_party/ceres/bundle.sh
@@ -194,8 +194,8 @@ if(HAVE_STD_UNORDERED_MAP_HEADER)
 	                          }"
 	                          HAVE_UNURDERED_MAP_IN_STD_NAMESPACE)
 	if(HAVE_UNURDERED_MAP_IN_STD_NAMESPACE)
-		ADD_DEFINITIONS(-DCERES_STD_UNORDERED_MAP)
-		MESSAGE("-- Found unordered_map/set in std namespace.")
+		add_definitions(-DCERES_STD_UNORDERED_MAP)
+		message(STATUS "Found unordered_map/set in std namespace.")
 	else()
 		CHECK_CXX_SOURCE_COMPILES("#include <unordered_map>
 		                          int main() {
@@ -204,24 +204,24 @@ if(HAVE_STD_UNORDERED_MAP_HEADER)
 		                          }"
 		                          HAVE_UNURDERED_MAP_IN_TR1_NAMESPACE)
 		if(HAVE_UNURDERED_MAP_IN_TR1_NAMESPACE)
-			ADD_DEFINITIONS(-DCERES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE)
-			MESSAGE("-- Found unordered_map/set in std::tr1 namespace.")
+			add_definitions(-DCERES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE)
+			message(STATUS "Found unordered_map/set in std::tr1 namespace.")
 		else()
-			MESSAGE("-- Found <unordered_map> but cannot find either std::unordered_map "
+			message(STATUS "Found <unordered_map> but cannot find either std::unordered_map "
 			        "or std::tr1::unordered_map.")
-			MESSAGE("-- Replacing unordered_map/set with map/set (warning: slower!)")
-			ADD_DEFINITIONS(-DCERES_NO_UNORDERED_MAP)
+			message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)")
+			add_definitions(-DCERES_NO_UNORDERED_MAP)
 		endif()
 	endif()
 else()
 	CHECK_INCLUDE_FILE_CXX("tr1/unordered_map" UNORDERED_MAP_IN_TR1_NAMESPACE)
 	if(UNORDERED_MAP_IN_TR1_NAMESPACE)
-		ADD_DEFINITIONS(-DCERES_TR1_UNORDERED_MAP)
-		MESSAGE("-- Found unordered_map/set in std::tr1 namespace.")
+		add_definitions(-DCERES_TR1_UNORDERED_MAP)
+		message(STATUS "Found unordered_map/set in std::tr1 namespace.")
 	else()
-		MESSAGE("-- Unable to find <unordered_map> or <tr1/unordered_map>. ")
-		MESSAGE("-- Replacing unordered_map/set with map/set (warning: slower!)")
-		ADD_DEFINITIONS(-DCERES_NO_UNORDERED_MAP)
+		message(STATUS "Unable to find <unordered_map> or <tr1/unordered_map>. ")
+		message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)")
+		add_definitions(-DCERES_NO_UNORDERED_MAP)
 	endif()
 endif()