diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2018-10-14 16:27:45 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2018-10-14 16:27:45 +0000 |
| commit | 73ecf0cde0818a7dc0c11f6b3ad2237d72098825 (patch) | |
| tree | 93ec0f53820d3b44688e33b035884300fb3e0f88 /databases/tarantool/files/patch-cmake-FindICONV.cmake | |
| parent | Fix configure with openssl 1.1.1 (diff) | |
Update to 1.10.2
Changes: https://github.com/tarantool/tarantool/releases
Notes
Notes:
svn path=/head/; revision=482052
Diffstat (limited to 'databases/tarantool/files/patch-cmake-FindICONV.cmake')
| -rw-r--r-- | databases/tarantool/files/patch-cmake-FindICONV.cmake | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/databases/tarantool/files/patch-cmake-FindICONV.cmake b/databases/tarantool/files/patch-cmake-FindICONV.cmake index ee19d1bda426..b4e92d86f3e4 100644 --- a/databases/tarantool/files/patch-cmake-FindICONV.cmake +++ b/databases/tarantool/files/patch-cmake-FindICONV.cmake @@ -1,18 +1,11 @@ ---- cmake/FindICONV.cmake.orig 2018-09-06 16:31:05 UTC +--- cmake/FindICONV.cmake.orig 2018-10-12 19:53:35 UTC +++ cmake/FindICONV.cmake -@@ -4,14 +4,8 @@ +@@ -4,7 +4,7 @@ # ICONV_LIBRARIES # -if (TARGET_OS_LINUX) +if (TARGET_OS_FREEBSD OR TARGET_OS_LINUX) set(ICONV_LIBRARY "") --else() -- find_library(ICONV_LIBRARY iconv) -- if(NOT ICONV_LIBRARY) -- message(WARNING "iconv library not found") -- set(ICONV_LIBRARY "") -- endif() - endif() - find_path(ICONV_INCLUDE_DIR iconv.h) - if(NOT ICONV_INCLUDE_DIR) + else() + find_library(ICONV_LIBRARY iconv) |