Permalink
Browse files

Merge branch '191-mac-os-wrong-expat-iconv' into 'master'

Resolve "Mac os links with wrong expat and iconv libraries"

Closes #191

See merge request manticoresearch/dev!26
  • Loading branch information...
klirichek committed Feb 5, 2018
2 parents e6eeb88 + c44db15 commit be35feef54ded59125750916cd211e56108eddae
Showing with 9 additions and 5 deletions.
  1. +9 −4 CMakeLists.txt
  2. +0 −1 cmake/FindICONV.cmake
@@ -18,6 +18,11 @@ IF ( NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES )
"MinSizeRel" "RelWithDebInfo" )
ENDIF ()
set ( CMAKE_DISABLE_FIND_PACKAGE_PkgConfig ON )
# runaround to configure error caused by absence of pkg_check_modules
macro( pkg_check_modules )
endmacro()
PROJECT ( MANTICORE )
SET ( MANTICORE_CMAKE_DIR "${MANTICORE_SOURCE_DIR}/cmake" )
SET ( CMAKE_MODULE_PATH "${MANTICORE_SOURCE_DIR}/cmake" )
@@ -295,6 +300,10 @@ else ( WIN32 )
unset ( USE_SYSLOG )
ENDIF ( USE_SYSLOG )
message ( STATUS "Option WITH_ZLIB ${WITH_ZLIB}" )
option_menu ( ZLIB "compile with zlib support" USE_ZLIB EXTRA_LIBRARIES )
mark_as_advanced ( WITH_ZLIB )
message ( STATUS "Option WITH_ODBC ${WITH_ODBC}" )
unset ( _DUMMY_LIB )
option_menu ( ODBC "compile with UnixODBC support" USE_ODBC _DUMMY_LIB )
@@ -312,10 +321,6 @@ else ( WIN32 )
message ( STATUS "ODBC will be linked as ${_DUMMY_LIB}" )
endif ( DL_UNIXODBC )
message ( STATUS "Option WITH_ZLIB ${WITH_ZLIB}" )
option_menu ( ZLIB "compile with zlib support" USE_ZLIB EXTRA_LIBRARIES )
mark_as_advanced ( WITH_ZLIB )
message ( STATUS "Option WITH_RLP ${WITH_RLP}" )
option ( WITH_RLP "compile with RLP library support" OFF )
if ( WITH_RLP )
@@ -44,7 +44,6 @@ CHECK_CXX_SOURCE_COMPILES ( "${_CHECK_ICONVC}" HAVE_LIBICONV )
if ( NOT HAVE_LIBICONV )
foreach ( LIB iconv libiconv )
UNSET ( LIBICONV_LIBRARY CACHE )
find_library ( LIBICONV_LIBRARY NAMES ${LIB} )
SET ( CMAKE_REQUIRED_LIBRARIES "${LIBICONV_LIBRARY}")
UNSET ( HAVE_LIBICONV CACHE )

0 comments on commit be35fee

Please sign in to comment.