summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Pappacoda <andrea@pappacoda.it>2022-08-01 12:31:31 +0200
committerAndrea Pappacoda <andrea@pappacoda.it>2022-08-01 12:31:31 +0200
commitadc8c03fe463c9c0aaa2cfcbc502bc65dc7b99b6 (patch)
treefcfa229ec1ace9288611d04c84508594becb763c
parentbuild: simplify find modules (diff)
downloadyuzu-adc8c03fe463c9c0aaa2cfcbc502bc65dc7b99b6.tar
yuzu-adc8c03fe463c9c0aaa2cfcbc502bc65dc7b99b6.tar.gz
yuzu-adc8c03fe463c9c0aaa2cfcbc502bc65dc7b99b6.tar.bz2
yuzu-adc8c03fe463c9c0aaa2cfcbc502bc65dc7b99b6.tar.lz
yuzu-adc8c03fe463c9c0aaa2cfcbc502bc65dc7b99b6.tar.xz
yuzu-adc8c03fe463c9c0aaa2cfcbc502bc65dc7b99b6.tar.zst
yuzu-adc8c03fe463c9c0aaa2cfcbc502bc65dc7b99b6.zip
-rw-r--r--externals/CMakeLists.txt2
-rw-r--r--externals/find-modules/FindOpus.cmake (renamed from externals/find-modules/Findopus.cmake)4
-rw-r--r--externals/opus/CMakeLists.txt2
-rw-r--r--src/core/CMakeLists.txt2
4 files changed, 5 insertions, 5 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 6d04ace1d..eea70fc27 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -128,7 +128,7 @@ endif()
if (YUZU_USE_BUNDLED_OPUS)
add_subdirectory(opus EXCLUDE_FROM_ALL)
else()
- find_package(opus 1.3 REQUIRED)
+ find_package(Opus 1.3 REQUIRED)
endif()
# FFMpeg
diff --git a/externals/find-modules/Findopus.cmake b/externals/find-modules/FindOpus.cmake
index 4ebf9ef7b..b68a6046b 100644
--- a/externals/find-modules/Findopus.cmake
+++ b/externals/find-modules/FindOpus.cmake
@@ -6,12 +6,12 @@ find_package(PkgConfig)
if (PKG_CONFIG_FOUND)
pkg_search_module(opus IMPORTED_TARGET GLOBAL opus)
if (opus_FOUND)
- add_library(Opus::Opus ALIAS PkgConfig::opus)
+ add_library(Opus::opus ALIAS PkgConfig::opus)
endif()
endif()
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(opus
+find_package_handle_standard_args(Opus
REQUIRED_VARS
opus_LINK_LIBRARIES
opus_FOUND
diff --git a/externals/opus/CMakeLists.txt b/externals/opus/CMakeLists.txt
index a92ffbd69..410ff7c08 100644
--- a/externals/opus/CMakeLists.txt
+++ b/externals/opus/CMakeLists.txt
@@ -256,4 +256,4 @@ PRIVATE
opus/src
)
-add_library(Opus::Opus ALIAS opus)
+add_library(Opus::opus ALIAS opus)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 40b1ea4a2..0d3286d58 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -787,7 +787,7 @@ endif()
create_target_directory_groups(core)
target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core)
-target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::Opus)
+target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::opus)
if (MINGW)
target_link_libraries(core PRIVATE ${MSWSOCK_LIBRARY})
endif()