foo

CMakeLists.txt

@@ -64,55 +64,24 @@ if (HAS_CFLAG_SHORTEN_64_TO_32)
     add_compile_options("-Wno-shorten-64-to-32")
 endif()
 
-find_package(ZLIB REQUIRED)
-find_package(CURL CONFIG REQUIRED)
-find_package(EXPAT CONFIG REQUIRED)
-find_package(Freetype REQUIRED)
-find_package(jansson CONFIG REQUIRED)
-find_package(JPEG REQUIRED)
-find_package(PNG REQUIRED)
-find_package(PCRE2 CONFIG REQUIRED)
-find_package(unofficial-minizip CONFIG REQUIRED)
-find_package(SDL2 REQUIRED)
-find_package(SndFile CONFIG REQUIRED)
 find_library(MATH m)
 find_package(OpenGL REQUIRED)
 find_package(Threads REQUIRED)
 
 find_package(PkgConfig)
-pkg_check_modules(speex REQUIRED IMPORTED_TARGET speex)
-pkg_check_modules(speexdsp REQUIRED IMPORTED_TARGET speexdsp)
-
-# remove once speex and speexdsp gains a cmake wrapper
-#[[
-set(VCPKG_ARCH_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}")
-find_path(SPEEX_INCLUDE_DIR NAMES speex/speex.h PATHS "${VCPKG_ARCH_DIR}/include" NO_DEFAULT_PATH REQUIRED)
-find_library(SPEEX_LIB_RELEASE NAMES speex PATHS "${VCPKG_ARCH_DIR}/lib" NO_DEFAULT_PATH)
-find_library(SPEEX_LIB_DEBUG NAMES speex PATHS "${VCPKG_ARCH_DIR}/debug/lib" NO_DEFAULT_PATH)
-if(NOT SPEEX_LIB_RELEASE AND NOT SPEEX_LIB_DEBUG)
-    message(FATAL_ERROR "Speex library not found")
-endif()
-add_library(SPEEX::SPEEX STATIC IMPORTED)
-set_target_properties(SPEEX::SPEEX PROPERTIES
-        IMPORTED_CONFIGURATIONS "Debug;Release"
-        IMPORTED_LOCATION_RELEASE "${SPEEX_LIB_RELEASE}"
-        IMPORTED_LOCATION_DEBUG "${SPEEX_LIB_DEBUG}"
-        INTERFACE_INCLUDE_DIRECTORIES "${SPEEX_INCLUDE_DIR}"
-)
-find_path(SPEEXDSP_INCLUDE_DIR NAMES speex/speexdsp_types.h PATHS "${VCPKG_ARCH_DIR}/include" NO_DEFAULT_PATH REQUIRED)
-find_library(SPEEXDSP_LIB_RELEASE NAMES speexdsp PATHS "${VCPKG_ARCH_DIR}/lib" NO_DEFAULT_PATH)
-find_library(SPEEXDSP_LIB_DEBUG NAMES speexdsp PATHS "${VCPKG_ARCH_DIR}/debug/lib" NO_DEFAULT_PATH)
-if(NOT SPEEXDSP_LIB_RELEASE AND NOT SPEEXDSP_LIB_DEBUG)
-    message(FATAL_ERROR "SpeexDSP library not found")
-endif()
-add_library(SPEEXDSP::SPEEXDSP STATIC IMPORTED)
-set_target_properties(SPEEXDSP::SPEEXDSP PROPERTIES
-        IMPORTED_CONFIGURATIONS "Debug;Release"
-        IMPORTED_LOCATION_RELEASE "${SPEEXDSP_LIB_RELEASE}"
-        IMPORTED_LOCATION_DEBUG "${SPEEXDSP_LIB_DEBUG}"
-        INTERFACE_INCLUDE_DIRECTORIES "${SPEEXDSP_INCLUDE_DIR}"
-)
-]]
+pkg_check_modules(cURL REQUIRED IMPORTED_TARGET libcurl)
+pkg_check_modules(Expat REQUIRED IMPORTED_TARGET expat)
+pkg_check_modules(FreeType REQUIRED IMPORTED_TARGET freetype2)
+pkg_check_modules(JPEG REQUIRED IMPORTED_TARGET libjpeg)
+pkg_check_modules(Jansson REQUIRED IMPORTED_TARGET jansson)
+pkg_check_modules(MiniZip REQUIRED IMPORTED_TARGET minizip)
+pkg_check_modules(PCRE2 REQUIRED IMPORTED_TARGET libpcre2-8)
+pkg_check_modules(PNG REQUIRED IMPORTED_TARGET libpng)
+pkg_check_modules(SDL2 REQUIRED IMPORTED_TARGET sdl2)
+pkg_check_modules(SndFile REQUIRED IMPORTED_TARGET sndfile)
+pkg_check_modules(Speex REQUIRED IMPORTED_TARGET speex)
+pkg_check_modules(SpeexDSP REQUIRED IMPORTED_TARGET speexdsp)
+pkg_check_modules(zlib REQUIRED IMPORTED_TARGET zlib)
 
 if (APPLE)
     find_library(FRAMEWORK_IOKIT IOKit REQUIRED)
@@ -879,19 +848,19 @@ target_link_libraries(ezquake PRIVATE
         shaders_classic
         documentation
 
-        ZLIB::ZLIB
-        CURL::libcurl
-        Freetype::Freetype
-        jansson::jansson
-        JPEG::JPEG
-        PNG::PNG
-        expat::expat
-        SndFile::sndfile
-        unofficial::minizip::minizip
-        pcre2::pcre2-8-static
-        SDL2::SDL2-static
-        PkgConfig::speex
-        PkgConfig::speexdsp
+        PkgConfig::zlib
+        PkgConfig::cURL
+        PkgConfig::Expat
+        PkgConfig::JPEG
+        PkgConfig::PCRE2
+        PkgConfig::SDL2
+        PkgConfig::Jansson
+        PkgConfig::SndFile
+        PkgConfig::PNG
+        PkgConfig::FreeType
+        PkgConfig::MiniZip
+        PkgConfig::Speex
+        PkgConfig::SpeexDSP
 
         OpenGL::GL
         Threads::Threads