Merge pull request #734 from FtZPetruska/cmake-force-find

CMake: Add option for strict dependency search

Author: Pedro-Beirao

.github/workflows/continuous_integration.yml

@@ -158,6 +158,7 @@ jobs:
           cmake -S prboom2
           -B build
           -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }}
+          -DSTRICT_FIND=ON
           ${{ matrix.config.extra_options }}
 
       - name: Build

prboom2/cmake/DsdaDependencies.cmake

@@ -1,5 +1,14 @@
 include_guard()
 
+if(STRICT_FIND)
+  set(dsda_strict_keyword)
+  if(CMAKE_VERSION VERSION_GREATER_EQUAL 4.1)
+    set(CMAKE_FIND_REQUIRED ON)
+  else()
+    set(dsda_strict_keyword REQUIRED)
+  endif()
+endif()
+
 # TODO: Move away from including this module this way
 include(PkgConfigHelper)
 
@@ -30,42 +39,42 @@ if(SndFile_VERSION VERSION_GREATER_EQUAL "1.1.0")
 endif()
 
 if(WITH_IMAGE)
-  find_package(SDL2_image)
+  find_package(SDL2_image ${dsda_strict_keyword})
   if(SDL2_image_FOUND)
     set(HAVE_LIBSDL2_IMAGE TRUE)
   endif()
 endif()
 
 if(WITH_MAD)
-  find_package(mad)
+  find_package(mad ${dsda_strict_keyword})
   if(mad_FOUND)
     set(HAVE_LIBMAD TRUE)
   endif()
 endif()
 
 if(WITH_FLUIDSYNTH)
-  find_package(FluidSynth)
+  find_package(FluidSynth ${dsda_strict_keyword})
   if(FluidSynth_FOUND)
     set(HAVE_LIBFLUIDSYNTH TRUE)
   endif()
 endif()
 
 if(WITH_XMP)
-  find_package(libxmp)
+  find_package(libxmp ${dsda_strict_keyword})
   if(libxmp_FOUND)
     set(HAVE_LIBXMP TRUE)
   endif()
 endif()
 
 if(WITH_VORBISFILE)
-  find_package(Vorbis COMPONENTS File)
+  find_package(Vorbis COMPONENTS File ${dsda_strict_keyword})
   if(Vorbis_File_FOUND)
     set(HAVE_LIBVORBISFILE TRUE)
   endif()
 endif()
 
 if(WITH_PORTMIDI)
-  find_package(PortMidi)
+  find_package(PortMidi ${dsda_strict_keyword})
   if(PortMidi_FOUND)
     set(HAVE_LIBPORTMIDI TRUE)
   endif()

prboom2/cmake/DsdaOptions.cmake

@@ -16,6 +16,7 @@ set(DOOMWADDIR "${CMAKE_INSTALL_PREFIX}/${default_wad_dir}" CACHE PATH "Path to
 set(DSDA_INSTALL_COPYRIGHT_DIR "${default_copyright_dir}" CACHE STRING "Destination of the copyright file")
 set(DSDA_INSTALL_BINDIR "${default_bin_dir}" CACHE STRING "Destination of the dsda-doom binary")
 
+option(STRICT_FIND "Fail configuration if an optional dependency is not found" OFF)
 option(SIMPLECHECKS "Enable checks which only impose significant overhead if a posible error is detected" ON)
 option(RANGECHECK "Enable internal range checking" OFF)