minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix two CMake build issues 

* PostgreSQL fallback code missed the includes (closes #11219)
* build failed when Freetype enabled but not found
This commit is contained in:
sfan5 2021-04-21 20:25:18 +02:00
parent daf862a38a
commit 3e2145d662
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@ -152,6 +152,7 @@ if(ENABLE_POSTGRESQL)
# but we don't need them, so continue anyway if only those are missing. # but we don't need them, so continue anyway if only those are missing.
if(PostgreSQL_INCLUDE_DIR AND PostgreSQL_LIBRARY) if(PostgreSQL_INCLUDE_DIR AND PostgreSQL_LIBRARY)
set(PostgreSQL_FOUND TRUE) set(PostgreSQL_FOUND TRUE)
set(PostgreSQL_INCLUDE_DIRS ${PostgreSQL_INCLUDE_DIR})
endif() endif()
else() else()
find_package(PostgreSQL) find_package(PostgreSQL)

2
src/irrlicht_changes/CMakeLists.txt
View File

@ -3,7 +3,7 @@ if (BUILD_CLIENT)
${CMAKE_CURRENT_SOURCE_DIR}/static_text.cpp ${CMAKE_CURRENT_SOURCE_DIR}/static_text.cpp
) )
if (ENABLE_FREETYPE) if (USE_FREETYPE)
set(client_irrlicht_changes_SRCS ${client_irrlicht_changes_SRCS} set(client_irrlicht_changes_SRCS ${client_irrlicht_changes_SRCS}
${CMAKE_CURRENT_SOURCE_DIR}/CGUITTFont.cpp ${CMAKE_CURRENT_SOURCE_DIR}/CGUITTFont.cpp
) )