[cmake] refactor: Use CPM over submodules #143

Merged
crueter merged 42 commits from refactor/cpm into master 2025-08-04 04:50:17 +02:00
6 changed files with 6 additions and 3 deletions
Showing only changes of commit 751ac51af4 - Show all commits

View file

@ -411,6 +411,7 @@ find_package(stb MODULE)
find_package(VulkanMemoryAllocator CONFIG)
find_package(ZLIB 1.2 REQUIRED)
find_package(zstd 1.5 REQUIRED)
find_package(Opus 1.3 MODULE)
# if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
# find_package(VulkanHeaders 1.3.274 REQUIRED)

View file

@ -226,6 +226,7 @@ else()
)
endif()
target_include_directories(audio_core PRIVATE ${OPUS_INCLUDE_DIRS})
target_link_libraries(audio_core PUBLIC common core opus)
if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)

View file

@ -3,7 +3,7 @@
#pragma once
#include <opus/opus.h>
#include <opus.h>
#include "common/common_types.h"

View file

@ -3,7 +3,7 @@
#pragma once
#include <opus/opus_multistream.h>
#include <opus_multistream.h>
#include "common/common_types.h"

View file

@ -4,7 +4,7 @@
#pragma once
#include <mutex>
#include <opus/opus.h>
#include <opus.h>
#include "audio_core/adsp/apps/opus/opus_decoder.h"
#include "audio_core/adsp/apps/opus/shared_memory.h"

View file

@ -1184,6 +1184,7 @@ else()
)
endif()
target_include_directories(core PRIVATE ${OPUS_INCLUDE_DIRS})
target_link_libraries(core PUBLIC common PRIVATE audio_core hid_core network video_core nx_tzdb tz)
target_link_libraries(core PUBLIC Boost::headers PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls RenderDoc::API)
if (MINGW)