diff options
| author | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-10-19 20:31:22 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-10-19 20:31:22 +0200 |
| commit | 4828c75af1878cc6a970bbdb29fe9da600ee8bc3 (patch) | |
| tree | e8b46113af27457727a6a4b15a94dd64840e1b73 | |
| parent | b761fe36e37f297c61c98cc185006be3c17c492e (diff) | |
| download | mariadb-git-4828c75af1878cc6a970bbdb29fe9da600ee8bc3.tar.gz | |
Fix formatting in 'INFO_BIN' on Windows - backport.
| -rw-r--r-- | cmake/info_macros.cmake.in | 8 |
1 files changed, 5 insertions, 3 deletions
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() |