diff options
| author | kwolekr <kwolekr@minetest.net> | 2015-06-29 02:39:22 -0400 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-06-29 12:32:01 +0200 |
| commit | 4e28c8d3c8af51b728a049c28806e0f740ac0106 (patch) | |
| tree | 88233da83cc61cda1aadbcf29cc513a0b58f47b4 /src/CMakeLists.txt | |
| parent | 0d65ee878c5301afdbd163aa2274e73588f88ed3 (diff) | |
| download | minetest-4e28c8d3c8af51b728a049c28806e0f740ac0106.tar.gz minetest-4e28c8d3c8af51b728a049c28806e0f740ac0106.tar.bz2 minetest-4e28c8d3c8af51b728a049c28806e0f740ac0106.zip | |
Fix *BSD build with GNU iconv
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e2f555860..0ed0b8015 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -249,11 +249,18 @@ else() else() set(PLATFORM_LIBS -lrt ${PLATFORM_LIBS}) endif(APPLE) - #set(CLIENT_PLATFORM_LIBS -lXxf86vm) + # This way Xxf86vm is found on OpenBSD too find_library(XXF86VM_LIBRARY Xxf86vm) mark_as_advanced(XXF86VM_LIBRARY) set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY}) + + # Prefer local iconv if installed + find_library(ICONV_LIBRARY iconv) + mark_as_advanced(ICONV_LIBRARY) + if (ICONV_LIBRARY) + set(PLATFORM_LIBS ${PLATFORM_LIBS} ${ICONV_LIBRARY}) + endif() endif() check_include_files(endian.h HAVE_ENDIAN_H) |