aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Shaw <johnny.shaw@live.com>2024-08-15 00:39:32 -0600
committerdundargoc <33953936+dundargoc@users.noreply.github.com>2024-10-08 08:57:42 +0200
commit7737f892063ac716c6d94b4329df788cf268a719 (patch)
tree9c5390983f95228b375c647d2639fa6dc514ea48
parent7de8bdaeb8792dd7a2c6f57a2181d72a95707ef0 (diff)
downloadrneovim-7737f892063ac716c6d94b4329df788cf268a719.tar.gz
rneovim-7737f892063ac716c6d94b4329df788cf268a719.tar.bz2
rneovim-7737f892063ac716c6d94b4329df788cf268a719.zip
fix: deps build for ARM64 MSVC
Problem: Neovim will not build for ARM64 using MSVC due to misconfigured gettext dependency build settings. Solution: Fix the dependency build settings for gettext when building with MSVC.
-rw-r--r--cmake.deps/cmake/GettextCMakeLists.txt23
1 files changed, 14 insertions, 9 deletions
diff --git a/cmake.deps/cmake/GettextCMakeLists.txt b/cmake.deps/cmake/GettextCMakeLists.txt
index 722420e830..b86f3c6a52 100644
--- a/cmake.deps/cmake/GettextCMakeLists.txt
+++ b/cmake.deps/cmake/GettextCMakeLists.txt
@@ -15,15 +15,20 @@ string(REPLACE "#undef HAVE_LONG_LONG_INT" "#define HAVE_LONG_LONG_INT 1" CONFIG
string(REPLACE "#undef HAVE_ICONV_H" "#define HAVE_ICONV_H 1" CONFIG_CONTENT ${CONFIG_CONTENT})
string(REPLACE "#undef HAVE_ICONV" "#define HAVE_ICONV 1" CONFIG_CONTENT ${CONFIG_CONTENT})
string(REPLACE "#undef ICONV_CONST" "#define ICONV_CONST const" CONFIG_CONTENT ${CONFIG_CONTENT})
-string(REPLACE "#undef uintmax_t" "
- #if _WIN64
- # define intmax_t long long
- # define uintmax_t unsigned long long
- #elif _WIN32
- # define intmax_t long
- # define uintmax_t unsigned long
- #endif"
- CONFIG_CONTENT ${CONFIG_CONTENT})
+if(MSVC)
+ string(REPLACE "#undef HAVE_STDINT_H_WITH_UINTMAX" "#define HAVE_STDINT_H_WITH_UINTMAX 1" CONFIG_CONTENT ${CONFIG_CONTENT})
+ string(REPLACE "#undef HAVE_STDINT_H" "#define HAVE_STDINT_H 1" CONFIG_CONTENT ${CONFIG_CONTENT})
+else()
+ string(REPLACE "#undef uintmax_t" "
+ #if _WIN64
+ # define intmax_t long long
+ # define uintmax_t unsigned long long
+ #elif _WIN32
+ # define intmax_t long
+ # define uintmax_t unsigned long
+ #endif"
+ CONFIG_CONTENT ${CONFIG_CONTENT})
+ endif()
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/gettext-runtime/config.h ${CONFIG_CONTENT})
set(HAVE_NEWLOCALE 0)