diff options
| author | Gregor Jasny <gjasny@googlemail.com> | 2015-04-09 09:04:35 (GMT) |
|---|---|---|
| committer | Gregor Jasny <gjasny@googlemail.com> | 2015-04-17 19:50:05 (GMT) |
| commit | 6693590f8144a905b423ca03fa8ed98df4468bae (patch) | |
| tree | d4565f9126dc70692fbf5e0d04220271b827def7 | |
| parent | a6331eb851c132d3d0496e738886ad76e13a92a0 (diff) | |
| download | CMake-6693590f8144a905b423ca03fa8ed98df4468bae.zip CMake-6693590f8144a905b423ca03fa8ed98df4468bae.tar.gz CMake-6693590f8144a905b423ca03fa8ed98df4468bae.tar.bz2 | |
Xcode: Refine quoting rules for Strings
$ and . do not need to be quoted, but brackets and * must be to
not confuse the Xcode parser.
| -rw-r--r-- | Source/cmXCodeObject.cxx | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/XcodeProject/XcodeFileType-check.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx index b9c41f3..e72d315 100644 --- a/Source/cmXCodeObject.cxx +++ b/Source/cmXCodeObject.cxx @@ -243,7 +243,7 @@ void cmXCodeObject::PrintString(std::ostream& os,std::string String) bool needQuote = (String.empty() || String.find("//") != String.npos || - String.find_first_of(" <>.+-=@$[],") != String.npos); + String.find_first_of(" <>+-*=@[](){},") != String.npos); const char* quote = needQuote? "\"" : ""; // Print the string, quoted and escaped as necessary. diff --git a/Tests/RunCMake/XcodeProject/XcodeFileType-check.cmake b/Tests/RunCMake/XcodeProject/XcodeFileType-check.cmake index 7882d7f..1847bc9 100644 --- a/Tests/RunCMake/XcodeProject/XcodeFileType-check.cmake +++ b/Tests/RunCMake/XcodeProject/XcodeFileType-check.cmake @@ -1,6 +1,6 @@ set(expect-default "explicitFileType = sourcecode") -set(expect-explicit "explicitFileType = \"sourcecode.c.h\"") -set(expect-lastKnown "lastKnownFileType = \"sourcecode.c.h\"") +set(expect-explicit "explicitFileType = sourcecode.c.h") +set(expect-lastKnown "lastKnownFileType = sourcecode.c.h") foreach(src default explicit lastKnown) file(STRINGS ${RunCMake_TEST_BINARY_DIR}/XcodeFileType.xcodeproj/project.pbxproj actual-${src} REGEX "PBXFileReference.*src-${src}") |