[Cmake-commits] [cmake-commits] king committed cmLocalGenerator.cxx 1.321 1.322

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Nov 30 11:16:30 EST 2009


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

Modified Files:
	cmLocalGenerator.cxx 
Log Message:
Singly-quote target names for Watcom linker

The Watcom tools do their own command-line parsing and do not accept
double-quotes.  Instead we single-quote the target output name when
invoking wlink and other Watcom tools.  This fixes support for spaces in
the target output directory path when it is not under the build tree.


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.321
retrieving revision 1.322
diff -C 2 -d -r1.321 -r1.322
*** cmLocalGenerator.cxx	21 Oct 2009 17:00:47 -0000	1.321
--- cmLocalGenerator.cxx	30 Nov 2009 16:16:24 -0000	1.322
***************
*** 912,915 ****
--- 912,925 ----
        return targetQuoted;
        }
+     if(variable == "TARGET_UNQUOTED")
+       {
+       std::string unquoted = replaceValues.Target;
+       std::string::size_type sz = unquoted.size();
+       if(sz > 2 && unquoted[0] == '\"' && unquoted[sz-1] == '\"')
+         {
+         unquoted = unquoted.substr(1, sz-2);
+         }
+       return unquoted;
+       }
      if(replaceValues.LanguageCompileFlags)
        {



More information about the Cmake-commits mailing list