From e17728a632048d96d4549566d93401da0fe2c677 Mon Sep 17 00:00:00 2001
From: b-r-o-c-k <brockmammen@gmail.com>
Date: Thu, 7 Jun 2018 21:31:24 -0500
Subject: build/msvc: Add support for building gettext tools with MSVC

Only includes the tools needed for Neovim: xgettext, msgfmt, and
msgmerge.
---
 third-party/cmake/BuildGettext.cmake | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'third-party/cmake/BuildGettext.cmake')

diff --git a/third-party/cmake/BuildGettext.cmake b/third-party/cmake/BuildGettext.cmake
index 1dd206a91b..45264167a5 100644
--- a/third-party/cmake/BuildGettext.cmake
+++ b/third-party/cmake/BuildGettext.cmake
@@ -15,15 +15,18 @@ if(MSVC)
     PATCH_COMMAND ${GIT_EXECUTABLE} -C ${DEPS_BUILD_DIR}/src/gettext init
       COMMAND ${GIT_EXECUTABLE} -C ${DEPS_BUILD_DIR}/src/gettext apply --ignore-whitespace
         ${CMAKE_CURRENT_SOURCE_DIR}/patches/gettext-Fix-compilation-on-a-system-without-alloca.patch
+        ${CMAKE_CURRENT_SOURCE_DIR}/patches/gettext-Fix-building-with-MSVC.patch
     CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy
       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/GettextCMakeLists.txt
-        ${DEPS_BUILD_DIR}/src/gettext/gettext-runtime/CMakeLists.txt
-      COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/gettext/gettext-runtime
+        ${DEPS_BUILD_DIR}/src/gettext/CMakeLists.txt
+      COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/gettext
         -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
         # Pass toolchain
         -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN}
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+        -DLIBICONV_INCLUDE_DIRS=${DEPS_INSTALL_DIR}/include
+        -DLIBICONV_LIBRARIES=${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libcharset${CMAKE_STATIC_LIBRARY_SUFFIX}$<SEMICOLON>${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libiconv${CMAKE_STATIC_LIBRARY_SUFFIX}
     BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE}
     INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config ${CMAKE_BUILD_TYPE})
 
@@ -32,3 +35,6 @@ else()
 endif()
 
 list(APPEND THIRD_PARTY_DEPS gettext)
+if(USE_BUNDLED_LIBICONV)
+  add_dependencies(gettext libiconv)
+endif()
-- 
cgit