Skip to content

Commit

Permalink
Remove the manual call to find_package_handle_standard_args for PhysFS.
Browse files Browse the repository at this point in the history
It is no longer necessary with modern PhysFS.cmake

Fixes #1621
  • Loading branch information
SiegeLordEx authored and SiegeLord committed Feb 12, 2025
1 parent 611f88a commit aaeff04
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions addons/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -188,17 +188,14 @@ addons_summary("- Memfile addon" SUPPORT_MEMFILE)

if(WANT_PHYSFS)
find_package(PhysFS)
# FindPhysFS.cmake in cmake-2.6.2 doesn't call this but it should.
find_package_handle_standard_args(PHYSFS DEFAULT_MSG
PHYSFS_LIBRARY PHYSFS_INCLUDE_DIR)
mark_as_advanced(PHYSFS_INCLUDE_DIR)
mark_as_advanced(PHYSFS_LIBRARY)

find_package(ZLIB)

# Does this copy of PhysicsFS require zlib to be linked separately?
# FindPhysFS should really figure this out for us, but it doesn't.
if(PHYSFS_FOUND)
if(PhysFS_FOUND)
set(CMAKE_REQUIRED_INCLUDES ${PHYSFS_INCLUDE_DIR})
set(CMAKE_REQUIRED_LIBRARIES ${PHYSFS_LIBRARY})
run_c_compile_test("
Expand All @@ -224,7 +221,7 @@ if(WANT_PHYSFS)
else()
message("WARNING: PhysicsFS needs zlib, zlib not found, disabling PhysFS support.")
endif()
endif(PHYSFS_FOUND)
endif()

if(SUPPORT_PHYSFS)
add_subdirectory(physfs)
Expand Down

0 comments on commit aaeff04

Please sign in to comment.