From 75771edc028f81f85a200cba5b2b109b405c39cc Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Fri, 11 Sep 2015 05:12:32 +0200 Subject: [PATCH] Whoops, forgot apostrophes. --- cmake.git-371fe92e.patch | 327 +++++---------------------------------- 1 file changed, 35 insertions(+), 292 deletions(-) diff --git a/cmake.git-371fe92e.patch b/cmake.git-371fe92e.patch index f60b50b..522cc5c 100644 --- a/cmake.git-371fe92e.patch +++ b/cmake.git-371fe92e.patch @@ -1,292 +1,35 @@ - - - - - - - - - -www.cmake.org Git - cmake.git/summary - - - - - - - - -
-projects / cmake.git / summary -
-
-
- - - -? search: - -
-
-
-summary | shortlog | log | commit | commitdiff | tree
-
-
-
 
- - - - - - - -
descriptionCMake
ownerKitware, Inc.
last changeThu, 10 Sep 2015 15:29:58 +0000 (11:29 -0400)
URLgit://cmake.org/cmake.git
http://cmake.org/cmake.git
git@cmake.org:cmake.git
-
-shortlog -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
11 hours agoBrad KingMerge topic 'cpack-cmake-special-characters-mangling' master nightly-mastercommit | commitdiff | tree | snapshot
11 hours agoBrad KingMerge topic 'cpack-deb-component-dependencies'commit | commitdiff | tree | snapshot
11 hours agoBrad KingMerge topic 'FindwxWidgets-updates'commit | commitdiff | tree | snapshot
11 hours agoBrad KingMerge topic 'FindSWIG-noproxy'commit | commitdiff | tree | snapshot
11 hours agoBrad KingMerge topic 'apple-no-libnetwork'commit | commitdiff | tree | snapshot
11 hours agoBrad KingMerge topic 'mingw-compile-features-C'commit | commitdiff | tree | snapshot
11 hours agoBrad KingMerge topic 'ar-option-order'commit | commitdiff | tree | snapshot
11 hours agoBrad KingMerge topic 'ghs-updates'commit | commitdiff | tree | snapshot
11 hours agoGregor Jasnycurl: Do not use libnetwork on Apple platformscommit | commitdiff | tree | snapshot
23 hours agoKitware RobotCMake Nightly Date Stampcommit | commitdiff | tree | snapshot
29 hours agoDomen VrankarCPack/Deb: enable per component setting of dependenciescommit | commitdiff | tree | snapshot
30 hours agoRoman DonchenkoCPack: don't mangle CMake-special characters when apply... commit | commitdiff | tree | snapshot
35 hours agoBrad KingMerge topic 'more-swift2-fixes'commit | commitdiff | tree | snapshot
35 hours agoBrad KingMerge topic 'fix-xcode-gtk2-tests'commit | commitdiff | tree | snapshot
35 hours agoBrad KingMerge topic 'doc-get_filename_component-typo'commit | commitdiff | tree | snapshot
35 hours agoBrad KingMerge topic 'wbpvf_no_deref'commit | commitdiff | tree | snapshot
...
-
-tags -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
4 weeks agov3.3.1CMake 3.3.1tag | commit | shortlog | log
7 weeks agov3.3.0CMake 3.3.0tag | commit | shortlog | log
8 weeks agov3.3.0-rc4CMake 3.3.0-rc4tag | commit | shortlog | log
2 months agov3.3.0-rc3CMake 3.3.0-rc3tag | commit | shortlog | log
3 months agov3.3.0-rc2CMake 3.3.0-rc2tag | commit | shortlog | log
3 months agov3.3.0-rc1CMake 3.3.0-rc1tag | commit | shortlog | log
3 months agov3.2.3CMake 3.2.3tag | commit | shortlog | log
4 months agov3.2.2CMake 3.2.2tag | commit | shortlog | log
6 months agov3.2.1CMake 3.2.1tag | commit | shortlog | log
6 months agov3.2.0CMake 3.2.0tag | commit | shortlog | log
6 months agov3.2.0-rc2CMake 3.2.0-rc2tag | commit | shortlog | log
6 months agov3.2.0-rc1CMake 3.2.0-rc1tag | commit | shortlog | log
6 months agov3.1.3CMake 3.1.3tag | commit | shortlog | log
7 months agov3.1.2CMake 3.1.2tag | commit | shortlog | log
7 months agov3.1.1CMake 3.1.1tag | commit | shortlog | log
8 months agov3.1.0CMake 3.1.0tag | commit | shortlog | log
...
-
-heads -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
5 hours agonextshortlog | log | tree
5 hours agonightlyshortlog | log | tree
11 hours agomastershortlog | log | tree
11 hours agonightly-mastershortlog | log | tree
4 weeks agomaintshortlog | log | tree
4 weeks agoreleaseshortlog | log | tree
12 months agohooksshortlog | log | tree
23 months agodashboardshortlog | log | tree
-
-
CMake
- - -
- - - - \ No newline at end of file +From 371fe92e82ecadede532a211c1ec36f7039268d7 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Thu, 27 Aug 2015 16:41:34 -0400 +Subject: [PATCH] Makefile: Print color escapes only when necessary + +Teach cmSystemTools::MakefileColorEcho to use the color printing API +only when we actually have a color to print. This avoids printing +escape sequences that do not change the text attributes. + +Since commit v3.3.0-rc1~480^2~4 (Makefile: Fix output during parallel +builds, 2015-02-05) we always use this code path to print progress and +rule messages even when color is disabled (e.g. in a try_compile). It +is important to avoid printing escapes when there is no color because on +MSYS we have no isatty and so assume that vt100 escapes are supported, +but we do not want to print them when capturing try_compile output. +--- + Source/cmSystemTools.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx +index e2adabe..b440a17 100644 +--- a/Source/cmSystemTools.cxx ++++ b/Source/cmSystemTools.cxx +@@ -2331,7 +2331,7 @@ void cmSystemTools::MakefileColorEcho(int color, const char* message, + assumeTTY = 0; + } + +- if(enabled) ++ if(enabled && color != cmsysTerminal_Color_Normal) + { + // Print with color. Delay the newline until later so that + // all color restore sequences appear before it. +-- +1.7.10.4 +