edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #2986

Browse source 
2986: Try to fix FindSQLite3.cmake r=heinrich5991 a=def-

For @panos' Haiku port: https://github.com/panos/ddnet

> CMake Error: The following variables are used in this project, but they are set to NOTFOUND.
> Please set them or make sure they are set and tested correctly in the CMake files:
> /boot/home/ddnet/SQLite3_INCLUDEDIR

@heinrich5991 thoughts?

Co-authored-by: def <dennis@felsin9.de>
This commit is contained in:
bors[bot] 2020-10-11 13:15:21 +00:00 committed by GitHub
parent 1a79fdec82 700bfd78b8
commit a83b7b0733
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cmake/FindSQLite3.cmake
View file

@ -4,31 +4,29 @@ if(NOT PREFER_BUNDLED_LIBS)
set(CMAKE_MODULE_PATH ${OWN_CMAKE_MODULE_PATH}) set(CMAKE_MODULE_PATH ${OWN_CMAKE_MODULE_PATH})
endif() endif()
if(NOT SQLite3_FOUND) if(NOT CMAKE_CROSSCOMPILING)
if(NOT CMAKE_CROSSCOMPILING)
find_package(PkgConfig QUIET) find_package(PkgConfig QUIET)
pkg_check_modules(PC_SQLite3 sqlite3) pkg_check_modules(PC_SQLite3 sqlite3)
endif() endif()
set_extra_dirs_lib(SQLite3 sqlite3) set_extra_dirs_lib(SQLite3 sqlite3)
find_library(SQLite3_LIBRARY find_library(SQLite3_LIBRARY
NAMES sqlite3 sqlite3.0 NAMES sqlite3 sqlite3.0
HINTS ${HINTS_SQLite3_LIBDIR} ${PC_SQLite3_LIBDIR} ${PC_SQLite3_LIBRARY_DIRS} HINTS ${HINTS_SQLite3_LIBDIR} ${PC_SQLite3_LIBDIR} ${PC_SQLite3_LIBRARY_DIRS}
PATHS ${PATHS_SQLite3_LIBDIR} PATHS ${PATHS_SQLite3_LIBDIR}
${CROSSCOMPILING_NO_CMAKE_SYSTEM_PATH} ${CROSSCOMPILING_NO_CMAKE_SYSTEM_PATH}
) )
set_extra_dirs_include(SQLite3 sqlite3 "${SQLite3_LIBRARY}") set_extra_dirs_include(SQLite3 sqlite3 "${SQLite3_LIBRARY}")
find_path(SQLite3_INCLUDEDIR sqlite3.h find_path(SQLite3_INCLUDEDIR sqlite3.h
PATH_SUFFIXES sqlite3 PATH_SUFFIXES sqlite3
HINTS ${HINTS_SQLite3_INCLUDEDIR} ${PC_SQLite3_INCLUDEDIR} ${PC_SQLite3_INCLUDE_DIRS} HINTS ${HINTS_SQLite3_INCLUDEDIR} ${PC_SQLite3_INCLUDEDIR} ${PC_SQLite3_INCLUDE_DIRS}
PATHS ${PATHS_SQLite3_INCLUDEDIR} PATHS ${PATHS_SQLite3_INCLUDEDIR}
${CROSSCOMPILING_NO_CMAKE_SYSTEM_PATH} ${CROSSCOMPILING_NO_CMAKE_SYSTEM_PATH}
) )
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(SQLite3 DEFAULT_MSG SQLite3_INCLUDEDIR SQLite3_LIBRARY) find_package_handle_standard_args(SQLite3 DEFAULT_MSG SQLite3_INCLUDEDIR SQLite3_LIBRARY)
mark_as_advanced(SQLite3_INCLUDEDIR SQLite3_LIBRARY) mark_as_advanced(SQLite3_INCLUDEDIR SQLite3_LIBRARY)
endif()
if(SQLite3_FOUND) if(SQLite3_FOUND)
is_bundled(SQLite3_BUNDLED "${SQLite3_LIBRARY}") is_bundled(SQLite3_BUNDLED "${SQLite3_LIBRARY}")