Mirrorlandia_minetest/minetestmapper
1
0
Fork 0
mirror of https://github.com/minetest/minetestmapper.git synced 2024-11-21 23:13:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Properly support -DENABLE_REDIS=TRUE even if library is not found

Browse Source
This commit is contained in:
sfan5 2020-03-27 16:27:55 +01:00
parent 84c4fc40f8
commit 04b9dffb11
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -3,7 +3,15 @@ compiler:
- gcc - gcc
- clang - clang
dist: bionic dist: bionic
before_install: sudo apt-get install -y cmake libgd-dev libsqlite3-dev libleveldb-dev addons:
apt:
packages:
- cmake
- libgd-dev
- libsqlite3-dev
- libleveldb-dev
- libpq-dev
- postgresql-server-dev-all
script: ./util/travis/script.sh script: ./util/travis/script.sh
notifications: notifications:
email: false email: false

11
CMakeLists.txt
View File

@ -95,6 +95,7 @@ if(ENABLE_POSTGRESQL)
include_directories(${PostgreSQL_INCLUDE_DIRS}) include_directories(${PostgreSQL_INCLUDE_DIRS})
else() else()
message(STATUS "PostgreSQL not found!") message(STATUS "PostgreSQL not found!")
set(PostgreSQL_LIBRARIES "")
endif() endif()
endif(ENABLE_POSTGRESQL) endif(ENABLE_POSTGRESQL)
@ -112,9 +113,10 @@ if(ENABLE_LEVELDB)
set(USE_LEVELDB TRUE) set(USE_LEVELDB TRUE)
message(STATUS "LevelDB backend enabled") message(STATUS "LevelDB backend enabled")
include_directories(${LEVELDB_INCLUDE_DIR}) include_directories(${LEVELDB_INCLUDE_DIR})
else(LEVELDB_LIBRARY AND LEVELDB_INCLUDE_DIR) else()
message(STATUS "LevelDB not found!") message(STATUS "LevelDB not found!")
endif(LEVELDB_LIBRARY AND LEVELDB_INCLUDE_DIR) set(LEVELDB_LIBRARY "")
endif()
endif(ENABLE_LEVELDB) endif(ENABLE_LEVELDB)
# Libraries: redis # Libraries: redis
@ -131,9 +133,10 @@ if(ENABLE_REDIS)
set(USE_REDIS TRUE) set(USE_REDIS TRUE)
message(STATUS "redis backend enabled") message(STATUS "redis backend enabled")
include_directories(${REDIS_INCLUDE_DIR}) include_directories(${REDIS_INCLUDE_DIR})
else(REDIS_LIBRARY AND REDIS_INCLUDE_DIR) else()
message(STATUS "redis not found!") message(STATUS "redis not found!")
endif(REDIS_LIBRARY AND REDIS_INCLUDE_DIR) set(REDIS_LIBRARY "")
endif()
endif(ENABLE_REDIS) endif(ENABLE_REDIS)
# Compiling & Linking # Compiling & Linking