Fix search of sqlite3, libxml2 and zlib on Mac OS X.

This commit is contained in:
Ghislain MARY 2016-03-18 14:20:12 +01:00
parent 60366de928
commit 9d0c5464c9
3 changed files with 21 additions and 11 deletions

View file

@ -27,12 +27,15 @@
# SQLITE3_LIBRARIES - The libraries needed to use sqlite3
if(APPLE AND NOT IOS)
set(_SQLITE3_ROOT_PATHS "/usr/lib")
set(SQLITE3_HINTS "/usr")
endif()
if(SQLITE3_HINTS)
set(SQLITE3_LIBRARIES_HINTS "${SQLITE3_HINTS}/lib")
endif()
find_path(SQLITE3_INCLUDE_DIRS
NAMES sqlite3.h
HINTS "${_SQLITE3_ROOT_PATHS}"
HINTS "${SQLITE3_HINTS}"
PATH_SUFFIXES include
)
@ -42,7 +45,7 @@ endif()
find_library(SQLITE3_LIBRARIES
NAMES sqlite3
HINTS "${_SQLITE3_ROOT_PATHS}"
HINTS "${SQLITE3_LIBRARIES_HINTS}"
)
include(FindPackageHandleStandardArgs)

View file

@ -27,12 +27,15 @@
# XML2_LIBRARIES - The libraries needed to use libxml2
if(APPLE AND NOT IOS)
set(_XML2_ROOT_PATHS "/usr/lib")
set(XML2_HINTS "/usr")
endif()
if(XML2_HINTS)
set(XML2_LIBRARIES_HINTS "${XML2_HINTS}/lib")
endif()
find_path(XML2_INCLUDE_DIRS
NAMES libxml/xmlreader.h
HINTS "${_XML2_ROOT_PATHS}"
HINTS "${XML2_HINTS}"
PATH_SUFFIXES include/libxml2
)
@ -42,7 +45,7 @@ endif()
find_library(XML2_LIBRARIES
NAMES xml2
HINTS "${_XML2_ROOT_PATHS}"
HINTS "${XML2_LIBRARIES_HINTS}"
)
include(FindPackageHandleStandardArgs)

View file

@ -25,13 +25,17 @@
# 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")
if(APPLE AND NOT IOS)
set(ZLIB_HINTS "/usr")
endif()
if(ZLIB_HINTS)
set(ZLIB_LIBRARIES_HINTS "${ZLIB_HINTS}/lib")
endif()
find_path(ZLIB_INCLUDE_DIRS
NAMES zlib.h
HINTS "${_ZLIB_ROOT_PATHS}"
HINTS "${ZLIB_HINTS}"
PATH_SUFFIXES include
)
@ -42,12 +46,12 @@ endif()
if(ENABLE_STATIC)
find_library(ZLIB_LIBRARIES
NAMES zstatic zlibstatic zlibstaticd z
HINTS "${_ZLIB_ROOT_PATHS}"
HINTS "${ZLIB_LIBRARIES_HINTS}"
)
else()
find_library(ZLIB_LIBRARIES
NAMES z zlib zlibd
HINTS "${_ZLIB_ROOT_PATHS}"
HINTS "${ZLIB_LIBRARIES_HINTS}"
)
endif()