[Cmake-commits] CMake branch, master, updated. v3.10.0-rc3-156-gdfaf84c

Kitware Robot kwrobot at kitware.com
Fri Oct 27 09:45:06 EDT 2017


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  dfaf84ca7328256348a656fb8d45e76a3f7c6b85 (commit)
       via  dcca130bb00d121266935aa2be0b72957b857a7c (commit)
       via  b779b8e85f20930491aea7b9da3b79f61c675804 (commit)
       via  a1b1f1a282b7d5b811ac15e2ae823d0db23fe70f (commit)
       via  20696a53e4f3a85886c1266c45923ea67f0ad494 (commit)
       via  606ece67ef971af6fcd11051ae9d5aab7c07027c (commit)
       via  576c079faadbff2bd5fafcbc9cecc03797625922 (commit)
       via  98cb9f3ee98261d0e7a591ba3b1971d49f1a2ee8 (commit)
      from  971b8c3c80372adf6cef54313927bc462f51d7da (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dfaf84ca7328256348a656fb8d45e76a3f7c6b85
commit dfaf84ca7328256348a656fb8d45e76a3f7c6b85
Merge: dcca130 20696a5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 27 13:43:33 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Oct 27 09:44:34 2017 -0400

    Merge topic 'findICU_update'
    
    20696a53 FindICU: Add support for static libraries on Windows
    606ece67 FindICU: Search in 'sbin' directories for icu tools
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1396


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcca130bb00d121266935aa2be0b72957b857a7c
commit dcca130bb00d121266935aa2be0b72957b857a7c
Merge: b779b8e 576c079
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 27 13:43:01 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Oct 27 09:43:09 2017 -0400

    Merge topic 'cmdparser-strcpy'
    
    576c079f cmCommandArgumentParser: remove the variable tokens from the class
    98cb9f3e cmCommandArgumentParserHelper: constify some char* values
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1410


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b779b8e85f20930491aea7b9da3b79f61c675804
commit b779b8e85f20930491aea7b9da3b79f61c675804
Merge: 971b8c3 a1b1f1a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 27 13:42:32 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Oct 27 09:42:37 2017 -0400

    Merge topic 'cmp0040-wording'
    
    a1b1f1a2 CMP0040: Clarify policy warning to match documentation
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1415


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1b1f1a282b7d5b811ac15e2ae823d0db23fe70f
commit a1b1f1a282b7d5b811ac15e2ae823d0db23fe70f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 26 08:15:03 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 26 09:47:29 2017 -0400

    CMP0040: Clarify policy warning to match documentation
    
    In commit v3.5.0-rc1~8^2~2 (Help: Clarify policy `CMP0040`
    documentation, 2016-01-28) the documentation was clarified to indicate
    that the target must be defined in the current directory.  Do the same
    for the text of the policy warning itself.
    
    Fixes: #17399

diff --git a/Help/policy/CMP0040.rst b/Help/policy/CMP0040.rst
index d46baf6..0afe589 100644
--- a/Help/policy/CMP0040.rst
+++ b/Help/policy/CMP0040.rst
@@ -2,7 +2,7 @@ CMP0040
 -------
 
 The target in the ``TARGET`` signature of :command:`add_custom_command`
-must exist and must be defined in current directory.
+must exist and must be defined in the current directory.
 
 CMake 2.8.12 and lower silently ignored a custom command created with
 the ``TARGET`` signature of :command:`add_custom_command`
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index 354011a..6c33e2b 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -126,7 +126,7 @@ class cmMakefile;
          3, 0, 0, cmPolicies::WARN)                                           \
   SELECT(POLICY, CMP0040,                                                     \
          "The target in the TARGET signature of add_custom_command() must "   \
-         "exist.",                                                            \
+         "exist and must be defined in the current directory.",               \
          3, 0, 0, cmPolicies::WARN)                                           \
   SELECT(POLICY, CMP0041,                                                     \
          "Error on relative include with generator expression.", 3, 0, 0,     \
diff --git a/Tests/RunCMake/CMP0040/CMP0040-WARN-missing-target-stderr.txt b/Tests/RunCMake/CMP0040/CMP0040-WARN-missing-target-stderr.txt
index e3e3ff4..70ed05b 100644
--- a/Tests/RunCMake/CMP0040/CMP0040-WARN-missing-target-stderr.txt
+++ b/Tests/RunCMake/CMP0040/CMP0040-WARN-missing-target-stderr.txt
@@ -1,8 +1,8 @@
 CMake Warning \(dev\) at CMP0040-WARN-missing-target.cmake:2 \(add_custom_command\):
   Policy CMP0040 is not set: The target in the TARGET signature of
-  add_custom_command\(\) must exist.  Run "cmake --help-policy CMP0040" for
-  policy details.  Use the cmake_policy command to set the policy and
-  suppress this warning.
+  add_custom_command\(\) must exist and must be defined in the current
+  directory.  Run "cmake --help-policy CMP0040" for policy details.  Use the
+  cmake_policy command to set the policy and suppress this warning.
 +
   No TARGET 'foobar' has been created in this directory.
 Call Stack \(most recent call first\):

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20696a53e4f3a85886c1266c45923ea67f0ad494
commit 20696a53e4f3a85886c1266c45923ea67f0ad494
Author:     Francois Budin <francois.budin at kitware.com>
AuthorDate: Wed Oct 25 16:21:48 2017 -0400
Commit:     Francois Budin <francois.budin at kitware.com>
CommitDate: Wed Oct 25 16:21:48 2017 -0400

    FindICU: Add support for static libraries on Windows
    
    When compiling ICU statically on Windows with Visual Studio, the library
    file names are prefixed with 's' [1].
    
    [1] http://source.icu-project.org/repos/icu/trunk/icu4c/source/icudefs.mk.in
        `STATIC_PREFIX_WHEN_USED = s`

diff --git a/Modules/FindICU.cmake b/Modules/FindICU.cmake
index 3021167..aa531d5 100644
--- a/Modules/FindICU.cmake
+++ b/Modules/FindICU.cmake
@@ -172,6 +172,11 @@ function(_ICU_FIND)
   # Find all ICU libraries
   list(APPEND icu_library_suffixes "${_lib64}" "lib")
   set(ICU_REQUIRED_LIBS_FOUND ON)
+  set(static_prefix )
+  # static icu libraries compiled with MSVC have the prefix 's'
+  if(MSVC)
+    set(static_prefix "s")
+  endif()
   foreach(component ${ICU_FIND_COMPONENTS})
     string(TOUPPER "${component}" component_upcase)
     set(component_cache "ICU_${component_upcase}_LIBRARY")
@@ -206,6 +211,20 @@ function(_ICU_FIND)
       list(APPEND component_debug_libnames "icui18nd")
     endif()
 
+    if(static_prefix)
+      unset(static_component_libnames)
+      unset(static_component_debug_libnames)
+      foreach(component_libname ${component_libnames})
+        list(APPEND static_component_libnames
+          ${static_prefix}${component_libname})
+      endforeach()
+      foreach(component_libname ${component_debug_libnames})
+        list(APPEND static_component_debug_libnames
+          ${static_prefix}${component_libname})
+      endforeach()
+      list(APPEND component_libnames ${static_component_libnames})
+      list(APPEND component_debug_libnames ${static_component_debug_libnames})
+    endif()
     find_library("${component_cache_release}" ${component_libnames}
       HINTS ${icu_roots}
       PATH_SUFFIXES ${icu_library_suffixes}

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=606ece67ef971af6fcd11051ae9d5aab7c07027c
commit 606ece67ef971af6fcd11051ae9d5aab7c07027c
Author:     Francois Budin <francois.budin at kitware.com>
AuthorDate: Wed Oct 25 16:20:19 2017 -0400
Commit:     Francois Budin <francois.budin at kitware.com>
CommitDate: Wed Oct 25 16:20:19 2017 -0400

    FindICU: Search in 'sbin' directories for icu tools
    
    On Ubuntu, several binaries that FindICU.cmake searches for are installed
    in 'sbin' instead of 'bin' [1].
    
    [1] https://packages.ubuntu.com/xenial/amd64/icu-devtools/filelist

diff --git a/Modules/FindICU.cmake b/Modules/FindICU.cmake
index d9705d9..3021167 100644
--- a/Modules/FindICU.cmake
+++ b/Modules/FindICU.cmake
@@ -156,7 +156,7 @@ function(_ICU_FIND)
 
 
   # Find all ICU programs
-  list(APPEND icu_binary_suffixes "${_bin64}" "bin")
+  list(APPEND icu_binary_suffixes "${_bin64}" "bin" "sbin")
   foreach(program ${icu_programs})
     string(TOUPPER "${program}" program_upcase)
     set(cache_var "ICU_${program_upcase}_EXECUTABLE")

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=576c079faadbff2bd5fafcbc9cecc03797625922
commit 576c079faadbff2bd5fafcbc9cecc03797625922
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Oct 25 17:34:01 2017 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Oct 25 19:56:33 2017 +0200

    cmCommandArgumentParser: remove the variable tokens from the class
    
    Make them local constants in the lexer file.

diff --git a/Source/LexerParser/cmCommandArgumentLexer.cxx b/Source/LexerParser/cmCommandArgumentLexer.cxx
index bf6bc2f..6b4fc85 100644
--- a/Source/LexerParser/cmCommandArgumentLexer.cxx
+++ b/Source/LexerParser/cmCommandArgumentLexer.cxx
@@ -674,6 +674,13 @@ Modify cmCommandArgumentLexer.cxx:
 /* Include the set of tokens from the parser.  */
 #include "cmCommandArgumentParserTokens.h"
 
+static const char *DCURLYVariable = "${";
+static const char *RCURLYVariable = "}";
+static const char *ATVariable = "@";
+static const char *DOLLARVariable = "$";
+static const char *LCURLYVariable = "{";
+static const char *BSLASHVariable = "\\";
+
 /*--------------------------------------------------------------------------*/
 
 #define INITIAL 0
@@ -1011,7 +1018,7 @@ YY_RULE_SETUP
 {
   //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl;
   //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
-  yylvalp->str = yyextra->DCURLYVariable;
+  yylvalp->str = DCURLYVariable;
   return cal_DCURLY;
 }
 	YY_BREAK
@@ -1020,7 +1027,7 @@ YY_RULE_SETUP
 {
   //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl;
   //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
-  yylvalp->str = yyextra->RCURLYVariable;
+  yylvalp->str = RCURLYVariable;
   return cal_RCURLY;
 }
 	YY_BREAK
@@ -1029,7 +1036,7 @@ YY_RULE_SETUP
 {
   //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl;
   //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
-  yylvalp->str = yyextra->ATVariable;
+  yylvalp->str = ATVariable;
   return cal_AT;
 }
 	YY_BREAK
@@ -1064,7 +1071,7 @@ case 10:
 YY_RULE_SETUP
 {
   //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
-  yylvalp->str = yyextra->DOLLARVariable;
+  yylvalp->str = DOLLARVariable;
   return cal_DOLLAR;
 }
 	YY_BREAK
@@ -1072,7 +1079,7 @@ case 11:
 YY_RULE_SETUP
 {
   //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
-  yylvalp->str = yyextra->LCURLYVariable;
+  yylvalp->str = LCURLYVariable;
   return cal_LCURLY;
 }
 	YY_BREAK
@@ -1080,7 +1087,7 @@ case 12:
 YY_RULE_SETUP
 {
   //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
-  yylvalp->str = yyextra->BSLASHVariable;
+  yylvalp->str = BSLASHVariable;
   return cal_BSLASH;
 }
 	YY_BREAK
@@ -1088,7 +1095,7 @@ case 13:
 YY_RULE_SETUP
 {
   //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
-  yylvalp->str = yyextra->BSLASHVariable;
+  yylvalp->str = BSLASHVariable;
   return cal_SYMBOL;
 }
 	YY_BREAK
diff --git a/Source/LexerParser/cmCommandArgumentLexer.in.l b/Source/LexerParser/cmCommandArgumentLexer.in.l
index acf18f3..5927b9e 100644
--- a/Source/LexerParser/cmCommandArgumentLexer.in.l
+++ b/Source/LexerParser/cmCommandArgumentLexer.in.l
@@ -28,6 +28,13 @@ Modify cmCommandArgumentLexer.cxx:
 /* Include the set of tokens from the parser.  */
 #include "cmCommandArgumentParserTokens.h"
 
+static const char *DCURLYVariable = "${";
+static const char *RCURLYVariable = "}";
+static const char *ATVariable = "@";
+static const char *DOLLARVariable = "$";
+static const char *LCURLYVariable = "{";
+static const char *BSLASHVariable = "\\";
+
 /*--------------------------------------------------------------------------*/
 %}
 
@@ -63,21 +70,21 @@ Modify cmCommandArgumentLexer.cxx:
 "${" {
   //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl;
   //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
-  yylvalp->str = yyextra->DCURLYVariable;
+  yylvalp->str = DCURLYVariable;
   return cal_DCURLY;
 }
 
 "}" {
   //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl;
   //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
-  yylvalp->str = yyextra->RCURLYVariable;
+  yylvalp->str = RCURLYVariable;
   return cal_RCURLY;
 }
 
 "@" {
   //std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl;
   //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
-  yylvalp->str = yyextra->ATVariable;
+  yylvalp->str = ATVariable;
   return cal_AT;
 }
 
@@ -103,25 +110,25 @@ Modify cmCommandArgumentLexer.cxx:
 
 "$" {
   //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
-  yylvalp->str = yyextra->DOLLARVariable;
+  yylvalp->str = DOLLARVariable;
   return cal_DOLLAR;
 }
 
 "{" {
   //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
-  yylvalp->str = yyextra->LCURLYVariable;
+  yylvalp->str = LCURLYVariable;
   return cal_LCURLY;
 }
 
 <ESCAPES>"\\" {
   //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
-  yylvalp->str = yyextra->BSLASHVariable;
+  yylvalp->str = BSLASHVariable;
   return cal_BSLASH;
 }
 
 <NOESCAPES>"\\" {
   //yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
-  yylvalp->str = yyextra->BSLASHVariable;
+  yylvalp->str = BSLASHVariable;
   return cal_SYMBOL;
 }
 
diff --git a/Source/cmCommandArgumentParserHelper.cxx b/Source/cmCommandArgumentParserHelper.cxx
index e115993..bf314bd 100644
--- a/Source/cmCommandArgumentParserHelper.cxx
+++ b/Source/cmCommandArgumentParserHelper.cxx
@@ -21,13 +21,6 @@ cmCommandArgumentParserHelper::cmCommandArgumentParserHelper()
   this->FileLine = -1;
   this->FileName = nullptr;
   this->RemoveEmpty = true;
-  this->EmptyVariable[0] = 0;
-  strcpy(this->DCURLYVariable, "${");
-  strcpy(this->RCURLYVariable, "}");
-  strcpy(this->ATVariable, "@");
-  strcpy(this->DOLLARVariable, "$");
-  strcpy(this->LCURLYVariable, "{");
-  strcpy(this->BSLASHVariable, "\\");
 
   this->NoEscapeMode = false;
   this->ReplaceAtSyntax = false;
@@ -47,7 +40,7 @@ void cmCommandArgumentParserHelper::SetLineFile(long line, const char* file)
 const char* cmCommandArgumentParserHelper::AddString(const std::string& str)
 {
   if (str.empty()) {
-    return this->EmptyVariable;
+    return "";
   }
   char* stVal = new char[str.size() + 1];
   strcpy(stVal, str.c_str());
@@ -62,7 +55,7 @@ const char* cmCommandArgumentParserHelper::ExpandSpecialVariable(
     return this->ExpandVariable(var);
   }
   if (!var) {
-    return this->EmptyVariable;
+    return "";
   }
   if (strcmp(key, "ENV") == 0) {
     std::string str;
@@ -72,7 +65,7 @@ const char* cmCommandArgumentParserHelper::ExpandSpecialVariable(
       }
       return this->AddString(str);
     }
-    return this->EmptyVariable;
+    return "";
   }
   if (strcmp(key, "CACHE") == 0) {
     if (const char* c =
@@ -82,7 +75,7 @@ const char* cmCommandArgumentParserHelper::ExpandSpecialVariable(
       }
       return this->AddString(c);
     }
-    return this->EmptyVariable;
+    return "";
   }
   std::ostringstream e;
   e << "Syntax $" << key << "{} is not supported.  "
diff --git a/Source/cmCommandArgumentParserHelper.h b/Source/cmCommandArgumentParserHelper.h
index d0d2db4..098c000 100644
--- a/Source/cmCommandArgumentParserHelper.h
+++ b/Source/cmCommandArgumentParserHelper.h
@@ -53,13 +53,6 @@ public:
   void SetRemoveEmpty(bool b) { this->RemoveEmpty = b; }
 
   const char* GetError() { return this->ErrorString.c_str(); }
-  char EmptyVariable[1];
-  char DCURLYVariable[3];
-  char RCURLYVariable[3];
-  char ATVariable[3];
-  char DOLLARVariable[3];
-  char LCURLYVariable[3];
-  char BSLASHVariable[3];
 
 private:
   std::string::size_type InputBufferPos;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98cb9f3ee98261d0e7a591ba3b1971d49f1a2ee8
commit 98cb9f3ee98261d0e7a591ba3b1971d49f1a2ee8
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Oct 25 17:03:45 2017 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Oct 25 19:56:33 2017 +0200

    cmCommandArgumentParserHelper: constify some char* values

diff --git a/Source/cmCommandArgumentParserHelper.cxx b/Source/cmCommandArgumentParserHelper.cxx
index 6ae58d6..e115993 100644
--- a/Source/cmCommandArgumentParserHelper.cxx
+++ b/Source/cmCommandArgumentParserHelper.cxx
@@ -44,7 +44,7 @@ void cmCommandArgumentParserHelper::SetLineFile(long line, const char* file)
   this->FileName = file;
 }
 
-char* cmCommandArgumentParserHelper::AddString(const std::string& str)
+const char* cmCommandArgumentParserHelper::AddString(const std::string& str)
 {
   if (str.empty()) {
     return this->EmptyVariable;
@@ -55,8 +55,8 @@ char* cmCommandArgumentParserHelper::AddString(const std::string& str)
   return stVal;
 }
 
-char* cmCommandArgumentParserHelper::ExpandSpecialVariable(const char* key,
-                                                           const char* var)
+const char* cmCommandArgumentParserHelper::ExpandSpecialVariable(
+  const char* key, const char* var)
 {
   if (!key) {
     return this->ExpandVariable(var);
@@ -91,7 +91,7 @@ char* cmCommandArgumentParserHelper::ExpandSpecialVariable(const char* key,
   return nullptr;
 }
 
-char* cmCommandArgumentParserHelper::ExpandVariable(const char* var)
+const char* cmCommandArgumentParserHelper::ExpandVariable(const char* var)
 {
   if (!var) {
     return nullptr;
@@ -125,11 +125,11 @@ char* cmCommandArgumentParserHelper::ExpandVariable(const char* var)
   return this->AddString(value ? value : "");
 }
 
-char* cmCommandArgumentParserHelper::ExpandVariableForAt(const char* var)
+const char* cmCommandArgumentParserHelper::ExpandVariableForAt(const char* var)
 {
   if (this->ReplaceAtSyntax) {
     // try to expand the variable
-    char* ret = this->ExpandVariable(var);
+    const char* ret = this->ExpandVariable(var);
     // if the return was 0 and we want to replace empty strings
     // then return an empty string
     if (!ret && this->RemoveEmpty) {
@@ -150,7 +150,8 @@ char* cmCommandArgumentParserHelper::ExpandVariableForAt(const char* var)
   return this->AddString(ref);
 }
 
-char* cmCommandArgumentParserHelper::CombineUnions(char* in1, char* in2)
+const char* cmCommandArgumentParserHelper::CombineUnions(const char* in1,
+                                                         const char* in2)
 {
   if (!in1) {
     return in2;
@@ -176,10 +177,11 @@ void cmCommandArgumentParserHelper::AllocateParserType(
   if (len == 0) {
     return;
   }
-  pt->str = new char[len + 1];
-  strncpy(pt->str, str, len);
-  pt->str[len] = 0;
-  this->Variables.push_back(pt->str);
+  char* out = new char[len + 1];
+  strncpy(out, str, len);
+  out[len] = 0;
+  pt->str = out;
+  this->Variables.push_back(out);
 }
 
 bool cmCommandArgumentParserHelper::HandleEscapeSymbol(
diff --git a/Source/cmCommandArgumentParserHelper.h b/Source/cmCommandArgumentParserHelper.h
index cb2a390..d0d2db4 100644
--- a/Source/cmCommandArgumentParserHelper.h
+++ b/Source/cmCommandArgumentParserHelper.h
@@ -17,7 +17,7 @@ class cmCommandArgumentParserHelper
 public:
   struct ParserType
   {
-    char* str;
+    const char* str;
   };
 
   cmCommandArgumentParserHelper();
@@ -35,11 +35,11 @@ public:
   void Error(const char* str);
 
   // For yacc
-  char* CombineUnions(char* in1, char* in2);
+  const char* CombineUnions(const char* in1, const char* in2);
 
-  char* ExpandSpecialVariable(const char* key, const char* var);
-  char* ExpandVariable(const char* var);
-  char* ExpandVariableForAt(const char* var);
+  const char* ExpandSpecialVariable(const char* key, const char* var);
+  const char* ExpandVariable(const char* var);
+  const char* ExpandVariableForAt(const char* var);
   void SetResult(const char* value);
 
   void SetMakefile(const cmMakefile* mf);
@@ -69,7 +69,7 @@ private:
   void Print(const char* place, const char* str);
   void SafePrintMissing(const char* str, int line, int cnt);
 
-  char* AddString(const std::string& str);
+  const char* AddString(const std::string& str);
 
   void CleanupParser();
   void SetError(std::string const& msg);

-----------------------------------------------------------------------

Summary of changes:
 Help/policy/CMP0040.rst                            |    2 +-
 Modules/FindICU.cmake                              |   21 ++++++++++-
 Source/LexerParser/cmCommandArgumentLexer.cxx      |   21 +++++++----
 Source/LexerParser/cmCommandArgumentLexer.in.l     |   21 +++++++----
 Source/cmCommandArgumentParserHelper.cxx           |   39 +++++++++-----------
 Source/cmCommandArgumentParserHelper.h             |   19 +++-------
 Source/cmPolicies.h                                |    2 +-
 .../CMP0040/CMP0040-WARN-missing-target-stderr.txt |    6 +--
 8 files changed, 76 insertions(+), 55 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list