diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2019-08-04 10:49:16 +0200 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-09-20 10:01:37 -0400 |
| commit | c688b401d3adaacc820ef4b589010e8aefa808b1 (patch) | |
| tree | 83e46e3dc7c9847692e61d0e6629b1cf9b65d2a5 /Source/CPack/WiX | |
| parent | 9c31d83aa2a3d3f5921f4a5a559e126e285b96c5 (diff) | |
| download | cmake-c688b401d3adaacc820ef4b589010e8aefa808b1.tar.gz | |
cmstd: Modernize CMake system headers
Provide a standardized way to handle the C++ "standard" headers
customized to be used with current CMake C++ standard constraints.
Offer under directory `cm` headers which can be used as direct
replacements of the standard ones. For example:
#include <cm/string_view>
can be used safely for CMake development in place of the `<string_view>`
standard header.
Fixes: #19491
Diffstat (limited to 'Source/CPack/WiX')
| -rw-r--r-- | Source/CPack/WiX/cmCPackWIXGenerator.cxx | 3 | ||||
| -rw-r--r-- | Source/CPack/WiX/cmWIXFilesSourceWriter.cxx | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index f78483260c..683f275d12 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -11,8 +11,9 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" #include "cmUuid.h" -#include "cm_string_view.hxx" + #include <algorithm> +#include <cm/string_view> #include "cmWIXDirectoriesSourceWriter.h" #include "cmWIXFeaturesSourceWriter.h" diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx index dd3caf9d3d..7705d839dc 100644 --- a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx +++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx @@ -9,10 +9,10 @@ #include "cmSystemTools.h" #include "cmUuid.h" -#include "cm_sys_stat.h" - #include "cmCMakeToWixPath.h" +#include "cm_sys_stat.h" + cmWIXFilesSourceWriter::cmWIXFilesSourceWriter(cmCPackLog* logger, std::string const& filename, GuidType componentGuidType) |