mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 12:49:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'stl-support'

Browse Source 
8d4a9ee398 Refactoring: rename "cm_static_string_view.hxx" as <cmext/string_view>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4689
This commit is contained in:
Brad King
2020-05-01 12:26:45 +00:00
committed by Kitware Robot
parent d1d1d4134d 8d4a9ee398
commit 68a59ab288
38 changed files with 43 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CMakeLists.txt
-1
View File
@@ -698,7 +698,6 @@ set(SRCS
cmWriteFileCommand.cxx
cmWriteFileCommand.h
cm_static_string_view.hxx
cm_get_date.h
cm_get_date.c
cm_utf8.h
Source/CTest/cmCTestBuildCommand.cxx
+1 -1
View File
@@ -5,7 +5,7 @@
#include <cstring>
#include <sstream>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
#include "cmCTest.h"
#include "cmCTestBuildHandler.h"
Source/CTest/cmCTestConfigureCommand.cxx
+1 -1
View File
@@ -6,7 +6,7 @@
#include <sstream>
#include <vector>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
#include "cmCTest.h"
#include "cmCTestConfigureHandler.h"
Source/CTest/cmCTestCoverageCommand.cxx
+1 -2
View File
@@ -5,8 +5,7 @@
#include <set>
#include <cmext/algorithm>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
#include "cmCTest.h"
#include "cmCTestCoverageHandler.h"
Source/CTest/cmCTestHandlerCommand.cxx
+1 -1
View File
@@ -7,7 +7,7 @@
#include <cstring>
#include <sstream>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
#include "cmCTest.h"
#include "cmCTestGenericHandler.h"
Source/CTest/cmCTestMemCheckCommand.cxx
+1 -1
View File
@@ -2,7 +2,7 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmCTestMemCheckCommand.h"
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
#include "cmCTest.h"
#include "cmCTestMemCheckHandler.h"
Source/CTest/cmCTestSubmitCommand.cxx
+1 -2
View File
@@ -9,8 +9,7 @@
#include <cm/memory>
#include <cm/vector>
#include <cmext/algorithm>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
#include "cmCTest.h"
#include "cmCTestSubmitHandler.h"
Source/CTest/cmCTestTestCommand.cxx
+1 -1
View File
@@ -6,7 +6,7 @@
#include <cstdlib>
#include <sstream>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
#include "cmCTest.h"
#include "cmCTestGenericHandler.h"
Source/CTest/cmCTestTestHandler.cxx
+1 -1
View File
@@ -20,13 +20,13 @@
#include <cm/memory>
#include <cm/string_view>
#include <cmext/algorithm>
#include <cmext/string_view>
#include "cmsys/FStream.hxx"
#include <cmsys/Base64.h>
#include <cmsys/Directory.hxx>
#include <cmsys/RegularExpression.hxx>
#include "cm_static_string_view.hxx"
#include "cm_utf8.h"
#include "cmCTest.h"
Source/CTest/cmCTestUploadCommand.cxx
+1 -2
View File
@@ -6,8 +6,7 @@
#include <sstream>
#include <cm/vector>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
#include "cmCTest.h"
#include "cmCTestUploadHandler.h"
Source/cmArgumentParser.h
+1 -2
View File
@@ -12,8 +12,7 @@
#include <vector>
#include <cm/string_view>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
namespace ArgumentParser {
Source/cmCTest.cxx
+1 -2
View File
@@ -19,6 +19,7 @@
#include <cm/memory>
#include <cm/string_view>
#include <cmext/algorithm>
#include <cmext/string_view>
#include "cmsys/Base64.h"
#include "cmsys/Directory.hxx"
@@ -36,8 +37,6 @@
# include <unistd.h> // IWYU pragma: keep
#endif
#include "cm_static_string_view.hxx"
#include "cmCTestBuildAndTestHandler.h"
#include "cmCTestBuildHandler.h"
#include "cmCTestConfigureHandler.h"
Source/cmConfigureFileCommand.cxx
+1 -2
View File
@@ -5,8 +5,7 @@
#include <set>
#include <cm/string_view>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
#include "cmExecutionStatus.h"
#include "cmMakefile.h"
Source/cmCoreTryCompile.cxx
+2 -2
View File
@@ -8,9 +8,9 @@
#include <sstream>
#include <utility>
#include "cmsys/Directory.hxx"
#include <cmext/string_view>
#include "cm_static_string_view.hxx"
#include "cmsys/Directory.hxx"
#include "cmExportTryCompileFileGenerator.h"
#include "cmGlobalGenerator.h"
Source/cmExecuteProcessCommand.cxx
+1 -2
View File
@@ -10,11 +10,10 @@
#include <vector>
#include <cmext/algorithm>
#include <cmext/string_view>
#include "cmsys/Process.h"
#include "cm_static_string_view.hxx"
#include "cmArgumentParser.h"
#include "cmExecutionStatus.h"
#include "cmMakefile.h"
Source/cmExportCommand.cxx
+1 -2
View File
@@ -8,11 +8,10 @@
#include <cm/memory>
#include <cmext/algorithm>
#include <cmext/string_view>
#include "cmsys/RegularExpression.hxx"
#include "cm_static_string_view.hxx"
#include "cmArgumentParser.h"
#include "cmExecutionStatus.h"
#include "cmExportBuildAndroidMKGenerator.h"
Source/cmFileCommand.cxx
+1 -1
View File
@@ -17,13 +17,13 @@
#include <cm/memory>
#include <cmext/algorithm>
#include <cmext/string_view>
#include "cmsys/FStream.hxx"
#include "cmsys/Glob.hxx"
#include "cmsys/RegularExpression.hxx"
#include "cm_kwiml.h"
#include "cm_static_string_view.hxx"
#include "cm_sys_stat.h"
#include "cmAlgorithms.h"
Source/cmForEachCommand.cxx
+1 -2
View File
@@ -18,8 +18,7 @@
#include <cm/memory>
#include <cm/string_view>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
#include "cmExecutionStatus.h"
#include "cmFunctionBlocker.h"
Source/cmFunctionCommand.cxx
+1 -2
View File
@@ -7,8 +7,7 @@
#include <cm/memory>
#include <cm/string_view>
#include <cmext/algorithm>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
#include "cmExecutionStatus.h"
#include "cmFunctionBlocker.h"
Source/cmGeneratorExpressionDAGChecker.cxx
+1 -2
View File
@@ -7,8 +7,7 @@
#include <utility>
#include <cm/string_view>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
#include "cmGeneratorExpressionContext.h"
#include "cmGeneratorExpressionEvaluator.h"
Source/cmGeneratorExpressionNode.cxx
+1 -2
View File
@@ -17,12 +17,11 @@
#include <cm/string_view>
#include <cm/vector>
#include <cmext/algorithm>
#include <cmext/string_view>
#include "cmsys/RegularExpression.hxx"
#include "cmsys/String.h"
#include "cm_static_string_view.hxx"
#include "cmAlgorithms.h"
#include "cmGeneratorExpression.h"
#include "cmGeneratorExpressionContext.h"
Source/cmGeneratorTarget.cxx
+1 -2
View File
@@ -18,11 +18,10 @@
#include <cm/memory>
#include <cm/string_view>
#include <cmext/algorithm>
#include <cmext/string_view>
#include "cmsys/RegularExpression.hxx"
#include "cm_static_string_view.hxx"
#include "cmAlgorithms.h"
#include "cmComputeLinkInformation.h"
#include "cmCustomCommand.h"
Source/cmIfCommand.cxx
+1 -2
View File
@@ -7,8 +7,7 @@
#include <cm/memory>
#include <cm/string_view>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
#include "cmConditionEvaluator.h"
#include "cmExecutionStatus.h"
Source/cmInstallCommand.cxx
+1 -2
View File
@@ -8,11 +8,10 @@
#include <utility>
#include <cm/memory>
#include <cmext/string_view>
#include "cmsys/Glob.hxx"
#include "cm_static_string_view.hxx"
#include "cmArgumentParser.h"
#include "cmExecutionStatus.h"
#include "cmExportSet.h"
Source/cmInstallCommandArguments.cxx
+1 -1
View File
@@ -4,7 +4,7 @@
#include <utility>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
#include "cmRange.h"
#include "cmSystemTools.h"
Source/cmListCommand.cxx
+1 -2
View File
@@ -17,11 +17,10 @@
#include <cm/memory>
#include <cmext/algorithm>
#include <cmext/string_view>
#include "cmsys/RegularExpression.hxx"
#include "cm_static_string_view.hxx"
#include "cmAlgorithms.h"
#include "cmExecutionStatus.h"
#include "cmGeneratorExpression.h"
Source/cmMacroCommand.cxx
+1 -2
View File
@@ -8,8 +8,7 @@
#include <cm/memory>
#include <cm/string_view>
#include <cmext/algorithm>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
#include "cmExecutionStatus.h"
#include "cmFunctionBlocker.h"
Source/cmMakefile.cxx
+1 -1
View File
@@ -18,13 +18,13 @@
#include <cm/optional>
#include <cm/vector>
#include <cmext/algorithm>
#include <cmext/string_view>
#include "cmsys/FStream.hxx"
#include "cmsys/RegularExpression.hxx"
#include "cm_jsoncpp_value.h"
#include "cm_jsoncpp_writer.h"
#include "cm_static_string_view.hxx"
#include "cm_sys_stat.h"
#include "cmCommandArgumentParserHelper.h"
Source/cmMessageCommand.cxx
+1 -2
View File
@@ -6,8 +6,7 @@
#include <utility>
#include <cm/string_view>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
#include "cmExecutionStatus.h"
#include "cmMakefile.h"
Source/cmString.hxx
+1 -2
View File
@@ -16,8 +16,7 @@
#include <utility>
#include <cm/string_view>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
namespace cm {
Source/cmStringCommand.cxx
+1 -2
View File
@@ -11,11 +11,10 @@
#include <memory>
#include <cm/iterator>
#include <cmext/string_view>
#include "cmsys/RegularExpression.hxx"
#include "cm_static_string_view.hxx"
#include "cmCryptoHash.h"
#include "cmExecutionStatus.h"
#include "cmGeneratorExpression.h"
Source/cmSubcommandTable.h
+1 -2
View File
@@ -11,8 +11,7 @@
#include <vector>
#include <cm/string_view>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
class cmExecutionStatus;
Source/cmWhileCommand.cxx
+1 -2
View File
@@ -7,8 +7,7 @@
#include <cm/memory>
#include <cm/string_view>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
#include "cmConditionEvaluator.h"
#include "cmExecutionStatus.h"
Source/cmake.cxx
+1 -1
View File
@@ -19,12 +19,12 @@
#endif
#include <cmext/algorithm>
#include <cmext/string_view>
#include "cmsys/FStream.hxx"
#include "cmsys/Glob.hxx"
#include "cmsys/RegularExpression.hxx"
#include "cm_static_string_view.hxx"
#include "cm_sys_stat.h"
#include "cmCommands.h"
Tests/CMakeLib/testArgumentParser.cxx
+1 -2
View File
@@ -7,8 +7,7 @@
#include <vector>
#include <cm/string_view>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
#include "cmArgumentParser.h"
Tests/CMakeLib/testString.cxx
+1 -2
View File
@@ -12,8 +12,7 @@
#include <utility>
#include <cm/string_view>
#include "cm_static_string_view.hxx"
#include <cmext/string_view>
#include "cmString.hxx"
Utilities/std/CMakeLists.txt
+2 -1
View File
@@ -9,6 +9,7 @@ set(SRCS cm/bits/string_view.cxx
cm/optional
cm/shared_mutex
cm/string_view
cm/utility)
cm/utility
cmext/string_view)
add_library(cmstd STATIC ${SRCS})
Source/cm_static_string_view.hxx → Utilities/std/cmext/string_view
+5 -4
View File
@@ -1,9 +1,10 @@
// -*-c++-*-
// vim: set ft=cpp:
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
#ifndef cm_static_string_view_hxx
#define cm_static_string_view_hxx
#include "cmConfigure.h" // IWYU pragma: keep
#ifndef cmext_string_view
#define cmext_string_view
#include <cstddef>