diff options
| author | Brad King <brad.king@kitware.com> | 2019-08-21 15:56:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-08-21 15:57:05 (GMT) |
| commit | dfb5936f0f1f689d6f729b78379a840971d8149c (patch) | |
| tree | 5c5f4bc8ddfce1441aae7193ee723e35e2983f76 /Source/cmGeneratorExpressionNode.cxx | |
| parent | ea4c3976fb593d0daf49c52e0a42818cd743b9ff (diff) | |
| parent | be7807478c463c5c875798a3e2e72e148c0d0c3e (diff) | |
| download | CMake-dfb5936f0f1f689d6f729b78379a840971d8149c.zip CMake-dfb5936f0f1f689d6f729b78379a840971d8149c.tar.gz CMake-dfb5936f0f1f689d6f729b78379a840971d8149c.tar.bz2 | |
Merge topic 'shared-string'
be7807478c cmDefinitions: Reduce allocation of keys and values in MakeClosure
e07e2bc8bb bootstrap: Compile cm::String
c1787cb5eb cpack.cxx: Re-order include blocks to follow our conventions
141e307484 cmConfigure.h: Tell windows.h not to define min/max macros
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3669
Diffstat (limited to 'Source/cmGeneratorExpressionNode.cxx')
| -rw-r--r-- | Source/cmGeneratorExpressionNode.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx index 2b21b91..8cd8858 100644 --- a/Source/cmGeneratorExpressionNode.cxx +++ b/Source/cmGeneratorExpressionNode.cxx @@ -19,11 +19,11 @@ #include "cmState.h" #include "cmStateSnapshot.h" #include "cmStateTypes.h" +#include "cmString.hxx" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" #include "cmTarget.h" #include "cm_static_string_view.hxx" -#include "cm_string_view.hxx" #include "cmake.h" #include "cmsys/RegularExpression.hxx" |