Fix two CMake build issues

* PostgreSQL fallback code missed the includes (closes #11219) * build failed when Freetype enabled but not found
minetest · Apr 21, 2021 · 3e2145d · 3e2145d
1 parent daf862a
commit 3e2145d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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
 		)