[Bf-blender-cvs] [2a97c17] master: CMake: minor message cleanups.

Brecht Van Lommel noreply at git.blender.org
Sat Oct 10 17:37:02 CEST 2015


Commit: 2a97c17549a858ce1beac22777bc0d2f3a535eb8
Author: Brecht Van Lommel
Date:   Sat Oct 10 17:30:19 2015 +0200
Branches: master
https://developer.blender.org/rB2a97c17549a858ce1beac22777bc0d2f3a535eb8

CMake: minor message cleanups.

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

M	CMakeLists.txt
M	build_files/cmake/buildinfo.cmake
M	build_files/cmake/packaging.cmake

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 029198f..1b5a0ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -532,13 +532,11 @@ if(APPLE)
 	else()
 		set(OSX_SYSTEM unsupported)
 	endif()
-	message(STATUS "Detected system-version: " ${OSX_SYSTEM})
 	
 	# workaround for incorrect cmake xcode lookup for developer previews - XCODE_VERSION does not take xcode-select path into accout
 	# but would always look into /Applications/Xcode.app while dev versions are named Xcode<version>-DP<preview_number>
 	execute_process(COMMAND xcode-select --print-path  OUTPUT_VARIABLE XCODE_CHECK OUTPUT_STRIP_TRAILING_WHITESPACE)
 	string(REPLACE "/Contents/Developer" "" XCODE_BUNDLE ${XCODE_CHECK}) # truncate to bundlepath in any case
-	message(STATUS "Xcode-bundle : " ${XCODE_BUNDLE})
 	
 	if(${CMAKE_GENERATOR} MATCHES "Xcode")
 	
@@ -566,8 +564,8 @@ if(APPLE)
 		string(SUBSTRING "${XCODE_VERS_BUILD_NR}" 6 3 XCODE_VERSION) # truncate away build-nr
 		unset(XCODE_VERS_BUILD_NR)
 	endif()
-	
-	message(STATUS "Detected Xcode-version: " ${XCODE_VERSION})
+
+	message(STATUS "Detected OS X ${OSX_SYSTEM} and Xcode ${XCODE_VERSION} at ${XCODE_BUNDLE}")
 
 	if(${XCODE_VERSION} VERSION_LESS 4.3)
 		set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE)  # use guaranteed existing sdk
diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake
index 81b0c1b..d292b35 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
 	find_package(Git)
 	if(GIT_FOUND)
-		message(STATUS "-- Found Git: ${GIT_EXECUTABLE}")
+		message(STATUS "Found Git: ${GIT_EXECUTABLE}")
 
 		execute_process(COMMAND git rev-parse --abbrev-ref HEAD
 		                WORKING_DIRECTORY ${SOURCE_DIR}
diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake
index f1939cf..accec6d 100644
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -23,7 +23,7 @@ set(MY_WC_HASH "unknown")
 if(EXISTS ${CMAKE_SOURCE_DIR}/.git/)
 	find_package(Git)
 	if(GIT_FOUND)
-		message(STATUS "-- Found Git: ${GIT_EXECUTABLE}")
+		message(STATUS "Found Git: ${GIT_EXECUTABLE}")
 		execute_process(COMMAND git rev-parse --short HEAD
 		                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 		                OUTPUT_VARIABLE MY_WC_HASH




More information about the Bf-blender-cvs mailing list