From 46ba64726b4261a4c25b579187682508d99b9e32 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Tue, 13 Feb 2024 20:54:18 +0100 Subject: Reverted the PhysicsFS check for Ubuntu 18.04 compatibility Apparently, pkg-config files for physfs were not shipping yet in Ubuntu 18.04. Now it no longer checks that we have at least physfs 3.0, but older versions should be pretty rare anyway. This reverts part of ffa8ea13fbf50ad59d9fc4cea71b9aec4aca8bac. --- src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c24bd350..227302c1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,6 @@ include(FindPkgConfig) pkg_check_modules(SDL2 REQUIRED sdl2>=2.0.1 SDL2_image SDL2_mixer SDL2_net SDL2_ttf SDL2_gfx) -pkg_check_modules(PHYSFS REQUIRED physfs>=3.0.0) +FIND_PACKAGE(PhysFS REQUIRED) FIND_PACKAGE(CURL REQUIRED) FIND_PACKAGE(LibXml2 REQUIRED) FIND_PACKAGE(PNG REQUIRED) @@ -640,7 +640,7 @@ TARGET_LINK_LIBRARIES(mana ${INTERNAL_LIBRARIES} ${SDL2_LIBRARIES} ${PNG_LIBRARIES} - ${PHYSFS_LIBRARIES} + ${PHYSFS_LIBRARY} ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES} ${GUICHAN_LIBRARIES} -- cgit v1.2.3-60-g2f50