Merge pull request #725 from FtZPetruska/cmake-find-fixes

CMake: FluidSynth and libmad find module updates

Author: rfomin

prboom2/CMakeLists.txt

@@ -58,8 +58,8 @@ if(WITH_IMAGE)
 endif()
 
 if(WITH_MAD)
-    find_package(LibMad)
-    if(LibMad_FOUND)
+    find_package(mad)
+    if(mad_FOUND)
         set(HAVE_LIBMAD TRUE)
     endif()
 endif()

prboom2/cmake/FindFluidSynth.cmake

@@ -56,7 +56,7 @@ find_file(
 
 find_library(
   FluidSynth_LIBRARY
-  NAMES fluidsynth libfluidsynth
+  NAMES fluidsynth libfluidsynth fluidsynth-3 libfluidsynth-3
   HINTS "${PC_FLUIDSYNTH_LIBDIR}"
 )
 

prboom2/cmake/FindLibMad.cmake

@@ -0,0 +1,63 @@
+#[=======================================================================[.rst:
+Findmad
+-------
+
+Finds the mad library.
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+This module provides the following imported targets, if found:
+
+``mad::mad``
+  The mad library
+
+Cache Variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
+
+``mad_INCLUDE_DIR``
+  The directory containing ``mad.h``.
+``mad_LIBRARY``
+  The path to the mad library.
+
+#]=======================================================================]
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_mad QUIET mad)
+
+find_path(
+  mad_INCLUDE_DIR
+  NAMES mad.h
+  HINTS "${PC_mad_INCLUDEDIR}"
+)
+
+find_library(
+  mad_LIBRARY
+  NAMES mad mad-0
+  HINTS "${PC_mad_LIBDIR}"
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+  mad
+  REQUIRED_VARS
+    mad_LIBRARY
+    mad_INCLUDE_DIR
+)
+
+if(mad_FOUND AND NOT TARGET mad::mad)
+  add_library(mad::mad UNKNOWN IMPORTED)
+  set_target_properties(
+    mad::mad
+    PROPERTIES
+      IMPORTED_LOCATION "${mad_LIBRARY}"
+      INTERFACE_INCLUDE_DIRECTORIES "${mad_INCLUDE_DIR}"
+  )
+endif()
+
+mark_as_advanced(
+  mad_INCLUDE_DIR
+  mad_LIBRARY
+)

prboom2/cmake/Findmad.cmake

@@ -567,7 +567,7 @@ function(AddGameExecutable TARGET SOURCES)
     endif()
 
     if(HAVE_LIBMAD)
-        target_link_libraries(${TARGET} PRIVATE LibMad::libmad)
+        target_link_libraries(${TARGET} PRIVATE mad::mad)
     endif()
 
     if(HAVE_LIBFLUIDSYNTH)