aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerw7 <erw7.github@gmail.com>2019-08-08 19:06:02 +0900
committerJustin M. Keyes <justinkz@gmail.com>2019-08-08 12:06:02 +0200
commit2e01e7ce8a3728aced13f06e262729519d8cad76 (patch)
tree22d2b99b83b137ab32909dea8b62ead8c8d04af7
parent1896c72a54256c9db7ae37bcd6c3b22b534aca0d (diff)
downloadrneovim-2e01e7ce8a3728aced13f06e262729519d8cad76.tar.gz
rneovim-2e01e7ce8a3728aced13f06e262729519d8cad76.tar.bz2
rneovim-2e01e7ce8a3728aced13f06e262729519d8cad76.zip
build/MSVC: Fix HAVE_ICONV_H #10697
Problem: HAVE_ICONV_H is not true in MSVC Solution: Since iconv.h does not exist in the standard include directory in MSVC, CMAKE_REQUIRED_INCLUDES must be set. Note: This will be unnecessary after #10708.
-rw-r--r--config/CMakeLists.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index 82cb4d31ad..d80686ff2e 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -20,7 +20,13 @@ endif()
check_symbol_exists(_NSGetEnviron crt_externs.h HAVE__NSGETENVIRON)
# Headers
+if(ICONV_INCLUDE_DIR)
+ list(APPEND CMAKE_REQUIRED_INCLUDES "${ICONV_INCLUDE_DIR}")
+endif()
check_include_files(iconv.h HAVE_ICONV_H)
+if(ICONV_INCLUDE_DIR)
+ list(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES "${ICONV_INCLUDE_DIR}")
+endif()
check_include_files(langinfo.h HAVE_LANGINFO_H)
check_include_files(locale.h HAVE_LOCALE_H)
check_include_files(pwd.h HAVE_PWD_H)