diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-06-10 13:56:42 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-06-10 13:56:42 +0200 |
| commit | 3fddd04565c3b511d27e61d1c426dda8c07f3b6d (patch) | |
| tree | 080b6b0019eed1db16b3743a908538408265a6da /third-party/cmake/BuildGettext.cmake | |
| parent | 7cc9d2b2b2e2cc4e78bf37512ac03ded3e18d6c1 (diff) | |
| parent | e17728a632048d96d4549566d93401da0fe2c677 (diff) | |
| download | rneovim-3fddd04565c3b511d27e61d1c426dda8c07f3b6d.tar.gz rneovim-3fddd04565c3b511d27e61d1c426dda8c07f3b6d.tar.bz2 rneovim-3fddd04565c3b511d27e61d1c426dda8c07f3b6d.zip | |
Merge #8516 'win/build: bundle libiconv, gettext tools'
Diffstat (limited to 'third-party/cmake/BuildGettext.cmake')
| -rw-r--r-- | third-party/cmake/BuildGettext.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
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() |