From a392df50b3cebdaa52da9df4b0547384a9d82668 Mon Sep 17 00:00:00 2001 From: Alex Turbov Date: Sun, 21 Aug 2022 06:28:51 +0400 Subject: Build: Move `KWSYS_ENCODING_DEFAULT_CODEPAGE` to the config header --- Source/CMakeLists.txt | 3 --- Source/cmConfigure.cmake.h.in | 2 ++ Source/cmWindowsRegistry.h | 2 ++ 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 // IWYU pragma: keep #include #include -- cgit v0.12