From ec64d88fd2c255375180d9fe3054b46572d0b398 Mon Sep 17 00:00:00 2001
From: Joerg Bruehe <joerg.bruehe@oracle.com>
Date: Fri, 19 Oct 2012 20:31:22 +0200
Subject: Fix formatting in 'INFO_BIN' on Windows - backport.

---
 cmake/info_macros.cmake.in | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'cmake')

diff --git a/cmake/info_macros.cmake.in b/cmake/info_macros.cmake.in
index 9e08cffb2bf..9f40a419c61 100644
--- a/cmake/info_macros.cmake.in
+++ b/cmake/info_macros.cmake.in
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -82,9 +82,11 @@ MACRO(CREATE_INFO_BIN)
 
   FILE(WRITE ${INFO_BIN} "===== Information about the build process: =====\n")
   IF (WIN32)
-    EXECUTE_PROCESS(COMMAND cmd /c date /T OUTPUT_VARIABLE TMP_DATE)
+    EXECUTE_PROCESS(COMMAND cmd /c date /T
+        OUTPUT_VARIABLE TMP_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
   ELSEIF(UNIX)
-    EXECUTE_PROCESS(COMMAND date "+%Y-%m-%d %H:%M:%S" OUTPUT_VARIABLE TMP_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+    EXECUTE_PROCESS(COMMAND date "+%Y-%m-%d %H:%M:%S"
+        OUTPUT_VARIABLE TMP_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
   ELSE()
     SET(TMP_DATE "(no date command known for this platform)")
   ENDIF()
-- 
cgit v1.2.1


From 19fa78561e52592521e1282efcb842b117d1feb9 Mon Sep 17 00:00:00 2001
From: Tor Didriksen <tor.didriksen@oracle.com>
Date: Tue, 23 Oct 2012 13:41:34 +0200
Subject: Use MESSAGE(STATUS ...) as we don't want any popup from the build
 system.

---
 cmake/mysql_version.cmake | 2 +-
 cmake/package_name.cmake  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'cmake')

diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake
index 59ee318f47b..566d5ce416d 100644
--- a/cmake/mysql_version.cmake
+++ b/cmake/mysql_version.cmake
@@ -54,7 +54,7 @@ MACRO(GET_MYSQL_VERSION)
   ENDIF()
 
   SET(VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EXTRA_VERSION}")
-  MESSAGE("-- MySQL ${VERSION}")
+  MESSAGE(STATUS "MySQL ${VERSION}")
   SET(MYSQL_BASE_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}" CACHE INTERNAL "MySQL Base version")
   SET(MYSQL_NO_DASH_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
   # Use NDBVERSION irregardless of whether this is Cluster or not, if not
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake
index d9e0902c921..43ad794e77b 100644
--- a/cmake/package_name.cmake
+++ b/cmake/package_name.cmake
@@ -123,7 +123,7 @@ IF(NOT VERSION)
     SET(package_name "mysql${PRODUCT_TAG}-${VERSION}-${SYSTEM_NAME_AND_PROCESSOR}")
   ENDIF()
 
-  MESSAGE("-- Packaging as: ${package_name}")
+  MESSAGE(STATUS "Packaging as: ${package_name}")
 
   # Sometimes package suffix is added (something like "-icc-glibc23")
   IF(PACKAGE_SUFFIX)
-- 
cgit v1.2.1