mirror of
https://github.com/minetest/minetest.git
synced 2024-08-19 04:54:18 +02:00
Look for PostgreSQL library properly and fix CI
This commit is contained in:
parent
1da73418cd
commit
a24899bf2d
@ -133,7 +133,7 @@ Compiling
|
|||||||
| Dependency | Version | Commentary |
|
| Dependency | Version | Commentary |
|
||||||
|------------|---------|------------|
|
|------------|---------|------------|
|
||||||
| GCC | 4.9+ | Can be replaced with Clang 3.4+ |
|
| GCC | 4.9+ | Can be replaced with Clang 3.4+ |
|
||||||
| CMake | 2.6+ | |
|
| CMake | 3.5+ | |
|
||||||
| Irrlicht | - | Custom version required, see https://github.com/minetest/irrlicht |
|
| Irrlicht | - | Custom version required, see https://github.com/minetest/irrlicht |
|
||||||
| SQLite3 | 3.0+ | |
|
| SQLite3 | 3.0+ | |
|
||||||
| LuaJIT | 2.0+ | Bundled Lua 5.1 is used if not present |
|
| LuaJIT | 2.0+ | Bundled Lua 5.1 is used if not present |
|
||||||
|
@ -146,7 +146,16 @@ option(ENABLE_POSTGRESQL "Enable PostgreSQL backend" TRUE)
|
|||||||
set(USE_POSTGRESQL FALSE)
|
set(USE_POSTGRESQL FALSE)
|
||||||
|
|
||||||
if(ENABLE_POSTGRESQL)
|
if(ENABLE_POSTGRESQL)
|
||||||
find_package("PostgreSQL")
|
if(CMAKE_VERSION VERSION_LESS "3.20")
|
||||||
|
find_package(PostgreSQL QUIET)
|
||||||
|
# Before CMake 3.20 FindPostgreSQL.cmake always looked for server includes
|
||||||
|
# but we don't need them, so continue anyway if only those are missing.
|
||||||
|
if(PostgreSQL_INCLUDE_DIR AND PostgreSQL_LIBRARY)
|
||||||
|
set(PostgreSQL_FOUND TRUE)
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
find_package(PostgreSQL)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(PostgreSQL_FOUND)
|
if(PostgreSQL_FOUND)
|
||||||
set(USE_POSTGRESQL TRUE)
|
set(USE_POSTGRESQL TRUE)
|
||||||
|
@ -5,8 +5,7 @@ install_linux_deps() {
|
|||||||
local pkgs=(cmake libpng-dev \
|
local pkgs=(cmake libpng-dev \
|
||||||
libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \
|
libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \
|
||||||
libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev \
|
libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev \
|
||||||
gettext libpq-dev postgresql-server-dev-all libleveldb-dev \
|
gettext libpq-dev libleveldb-dev libcurl4-openssl-dev)
|
||||||
libcurl4-openssl-dev)
|
|
||||||
|
|
||||||
if [[ "$1" == "--old-irr" ]]; then
|
if [[ "$1" == "--old-irr" ]]; then
|
||||||
shift
|
shift
|
||||||
|
Loading…
Reference in New Issue
Block a user