diff --git a/CMakeLists.txt b/CMakeLists.txt index 674839af57a8..7acf84a5fa1d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -672,7 +672,7 @@ dolphin_make_imported_target_if_missing(LibLZMA::LibLZMA LIBLZMA) dolphin_find_optional_system_library_pkgconfig(ZSTD libzstd>=1.4.0 zstd::zstd Externals/zstd) -dolphin_find_optional_system_library_pkgconfig(ZLIB zlib-ng ZLIB::ZLIB Externals/zlib-ng) +dolphin_find_optional_system_library_pkgconfig(ZLIB zlib ZLIB::ZLIB Externals/zlib-ng) dolphin_find_optional_system_library_pkgconfig(MINIZIP "minizip>=4.0.4" minizip::minizip Externals/minizip-ng diff --git a/Externals/discord-rpc/CMakeLists.txt b/Externals/discord-rpc/CMakeLists.txt index eae0ce06a771..51c82cb89f31 100644 --- a/Externals/discord-rpc/CMakeLists.txt +++ b/Externals/discord-rpc/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.2.0) +cmake_minimum_required (VERSION 3.5) project (DiscordRPC) include(GNUInstallDirs) diff --git a/Externals/minizip-ng/CMakeLists.txt b/Externals/minizip-ng/CMakeLists.txt index 3a2e7e6b670b..56df835f649c 100644 --- a/Externals/minizip-ng/CMakeLists.txt +++ b/Externals/minizip-ng/CMakeLists.txt @@ -1,5 +1,8 @@ project(minizip C) +include(CheckFunctionExists) +include(CheckIncludeFile) + add_library(minizip STATIC minizip-ng/mz.h minizip-ng/mz_compat.c diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index 673fd6eae5a7..619a27eced60 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -15,6 +15,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets Svg) +find_package(Qt6 QUIET COMPONENTS GuiPrivate) message(STATUS "Found Qt version ${Qt6_VERSION}") set_property(TARGET Qt6::Core PROPERTY INTERFACE_COMPILE_FEATURES "") @@ -425,6 +426,10 @@ PRIVATE implot ) +if(TARGET Qt6::GuiPrivate) + target_link_libraries(dolphin-emu PRIVATE Qt6::GuiPrivate) +endif() + if (WIN32) target_link_libraries(dolphin-emu PRIVATE