diff options
| author | sfan5 <sfan5@live.de> | 2021-04-21 20:25:18 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2021-04-21 20:26:43 +0200 |
| commit | 3e2145d662d26443e96ac7191eda093c85c6f2bc (patch) | |
| tree | 4d2df8bc9a15323e0d7923704b0e15eafab52c47 | |
| parent | daf862a38a0df84a7e4cd387e41c55ae4467f4d2 (diff) | |
| download | minetest-3e2145d662d26443e96ac7191eda093c85c6f2bc.tar.gz minetest-3e2145d662d26443e96ac7191eda093c85c6f2bc.tar.bz2 minetest-3e2145d662d26443e96ac7191eda093c85c6f2bc.zip | |
Fix two CMake build issues
* PostgreSQL fallback code missed the includes (closes #11219)
* build failed when Freetype enabled but not found
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/irrlicht_changes/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f70e77dcc..5298a8f0d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -152,6 +152,7 @@ if(ENABLE_POSTGRESQL) # 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) + set(PostgreSQL_INCLUDE_DIRS ${PostgreSQL_INCLUDE_DIR}) endif() else() find_package(PostgreSQL) diff --git a/src/irrlicht_changes/CMakeLists.txt b/src/irrlicht_changes/CMakeLists.txt index d2f66ab77..87c88f7e8 100644 --- a/src/irrlicht_changes/CMakeLists.txt +++ b/src/irrlicht_changes/CMakeLists.txt @@ -3,7 +3,7 @@ if (BUILD_CLIENT) ${CMAKE_CURRENT_SOURCE_DIR}/static_text.cpp ) - if (ENABLE_FREETYPE) + if (USE_FREETYPE) set(client_irrlicht_changes_SRCS ${client_irrlicht_changes_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/CGUITTFont.cpp ) |