summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Turbov <i.zaufi@gmail.com>2022-08-21 02:28:51 (GMT)
committerBrad King <brad.king@kitware.com>2022-09-22 13:24:48 (GMT)
commita392df50b3cebdaa52da9df4b0547384a9d82668 (patch)
tree0acb0aef3e1518b62869ced6b72f935cc6a92c54
parent94bc776ec2c95d847d7344f4a01e745cc9cb6651 (diff)
downloadCMake-a392df50b3cebdaa52da9df4b0547384a9d82668.zip
CMake-a392df50b3cebdaa52da9df4b0547384a9d82668.tar.gz
CMake-a392df50b3cebdaa52da9df4b0547384a9d82668.tar.bz2
Build: Move `KWSYS_ENCODING_DEFAULT_CODEPAGE` to the config header
-rw-r--r--Source/CMakeLists.txt3
-rw-r--r--Source/cmConfigure.cmake.h.in2
-rw-r--r--Source/cmWindowsRegistry.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 0cb2a57..424cb5f 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -765,9 +765,6 @@ target_link_libraries(
${CMAKE_THREAD_LIBS_INIT}
)
-set_property(SOURCE cmProcessOutput.cxx cmWindowsRegistry.cxx APPEND PROPERTY COMPILE_DEFINITIONS
- KWSYS_ENCODING_DEFAULT_CODEPAGE=${KWSYS_ENCODING_DEFAULT_CODEPAGE})
-
# Check if we can build the Mach-O parser.
if(CMake_USE_MACH_PARSER)
target_sources(
diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in
index 7dc9d62..90f3de0 100644
--- a/Source/cmConfigure.cmake.h.in
+++ b/Source/cmConfigure.cmake.h.in
@@ -39,3 +39,5 @@
#cmakedefine01 CMake_STAT_HAS_ST_MTIM
#cmakedefine01 CMake_STAT_HAS_ST_MTIMESPEC
+
+#cmakedefine KWSYS_ENCODING_DEFAULT_CODEPAGE @KWSYS_ENCODING_DEFAULT_CODEPAGE@
diff --git a/Source/cmWindowsRegistry.h b/Source/cmWindowsRegistry.h
index 2eed297..f4a0e7b 100644
--- a/Source/cmWindowsRegistry.h
+++ b/Source/cmWindowsRegistry.h
@@ -2,6 +2,8 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#pragma once
+#include "cmConfigure.h" // IWYU pragma: keep
+
#include <cstdint> // IWYU pragma: keep
#include <string>
#include <vector>