[Cmake-commits] [cmake-commits] king committed cmLocalGenerator.cxx 1.298 1.299

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Mar 17 15:11:35 EDT 2009


Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv11513/Source

Modified Files:
	cmLocalGenerator.cxx 
Log Message:
BUG: Allow more shell ops in custom commands

This extends the set of common shell operators to include "||", "&&",
"1>", and "2>".  See issue #6868.


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.298
retrieving revision 1.299
diff -C 2 -d -r1.298 -r1.299
*** cmLocalGenerator.cxx	16 Mar 2009 14:40:23 -0000	1.298
--- cmLocalGenerator.cxx	17 Mar 2009 19:11:33 -0000	1.299
***************
*** 2714,2718 ****
--- 2714,2722 ----
       strcmp(str, ">>") == 0 ||
       strcmp(str, "|") == 0 ||
+      strcmp(str, "||") == 0 ||
+      strcmp(str, "&&") == 0 ||
       strcmp(str, "&>") == 0 ||
+      strcmp(str, "1>") == 0 ||
+      strcmp(str, "2>") == 0 ||
       strcmp(str, "2>&1") == 0 ||
       strcmp(str, "1>&2") == 0)



More information about the Cmake-commits mailing list