Commit a6d669b8 authored by François Grisez's avatar François Grisez
Browse files

Use the MacOSX versions of libsqlite3, libxml2 and libz

parent 34a82528
......@@ -26,13 +26,13 @@
# SQLITE3_INCLUDE_DIRS - the sqlite3 include directory
# SQLITE3_LIBRARIES - The libraries needed to use sqlite3
set(_SQLITE3_ROOT_PATHS
${CMAKE_INSTALL_PREFIX}
)
if(APPLE AND NOT IOS)
set(_SQLITE3_ROOT_PATHS "/usr/lib")
endif()
find_path(SQLITE3_INCLUDE_DIRS
NAMES sqlite3.h
HINTS _SQLITE3_ROOT_PATHS
HINTS "${_SQLITE3_ROOT_PATHS}"
PATH_SUFFIXES include
)
......@@ -42,8 +42,7 @@ endif()
find_library(SQLITE3_LIBRARIES
NAMES sqlite3
HINTS ${_SQLITE3_ROOT_PATHS}
PATH_SUFFIXES bin lib
HINTS "${_SQLITE3_ROOT_PATHS}"
)
include(FindPackageHandleStandardArgs)
......
......@@ -26,13 +26,13 @@
# XML2_INCLUDE_DIRS - the libxml2 include directory
# XML2_LIBRARIES - The libraries needed to use libxml2
set(_XML2_ROOT_PATHS
${CMAKE_INSTALL_PREFIX}
)
if(APPLE AND NOT IOS)
set(_XML2_ROOT_PATHS "/usr/lib")
endif()
find_path(XML2_INCLUDE_DIRS
NAMES libxml/xmlreader.h
HINTS _XML2_ROOT_PATHS
HINTS "${_XML2_ROOT_PATHS}"
PATH_SUFFIXES include/libxml2
)
......@@ -42,8 +42,7 @@ endif()
find_library(XML2_LIBRARIES
NAMES xml2
HINTS ${_XML2_ROOT_PATHS}
PATH_SUFFIXES bin lib
HINTS "${_XML2_ROOT_PATHS}"
)
include(FindPackageHandleStandardArgs)
......
......@@ -25,10 +25,13 @@
# ZLIB_FOUND - system has zlib
# ZLIB_INCLUDE_DIRS - the zlib include directory
# ZLIB_LIBRARIES - The libraries needed to use zlib
if(APPLE AND IOS)
set(_ZLIB_ROOT_PATHS "/usr/lib")
endif()
find_path(ZLIB_INCLUDE_DIRS
NAMES zlib.h
HINTS _ZLIB_ROOT_PATHS
HINTS "${_ZLIB_ROOT_PATHS}"
PATH_SUFFIXES include
)
......@@ -39,12 +42,12 @@ endif()
if(ENABLE_STATIC)
find_library(ZLIB_LIBRARIES
NAMES zstatic zlibstatic zlibstaticd z
PATH_SUFFIXES bin lib
HINTS "${_ZLIB_ROOT_PATHS}"
)
else()
find_library(ZLIB_LIBRARIES
NAMES z zlib zlibd
PATH_SUFFIXES bin lib
HINTS "${_ZLIB_ROOT_PATHS}"
)
endif()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment