Skip to content

Commit 17b9bb4

Browse files
committed
cmake: don't use Ogg::Ogg
1 parent f89dc78 commit 17b9bb4

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,6 @@ if(SDL3MIXER_OPUS)
468468
endif()
469469
else()
470470
find_package(OpusFile ${required})
471-
find_package(Ogg ${required})
472471
if(OpusFile_FOUND AND Ogg_FOUND)
473472
set(SDL3MIXER_OPUS_ENABLED TRUE)
474473
message(STATUS "Using system opusfile")
@@ -486,9 +485,6 @@ if(SDL3MIXER_OPUS)
486485
$<TARGET_PROPERTY:OpusFile::opusfile,INCLUDE_DIRECTORIES>
487486
$<TARGET_PROPERTY:OpusFile::opusfile,INTERFACE_INCLUDE_DIRECTORIES>
488487
$<TARGET_PROPERTY:OpusFile::opusfile,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
489-
$<TARGET_PROPERTY:Ogg::Ogg,INCLUDE_DIRECTORIES>
490-
$<TARGET_PROPERTY:Ogg::Ogg,INTERFACE_INCLUDE_DIRECTORIES>
491-
$<TARGET_PROPERTY:Ogg::Ogg,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
492488
)
493489
target_get_dynamic_library(dynamic_opusfile OpusFile::opusfile)
494490
message(STATUS "Dynamic opus (opusfile): ${dynamic_opusfile}")

cmake/FindOpusFile.cmake

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ set(OpusFile_LINK_OPTIONS "${_opusfile_link_options}" CACHE STRING "Extra link f
2525

2626
set(OpusFile_LINK_DIRECTORIES "${_opusfile_link_directories}" CACHE PATH "Extra link directories of opusfile")
2727

28+
find_package(Ogg ${required})
29+
2830
find_package_handle_standard_args(OpusFile
29-
REQUIRED_VARS OpusFile_LIBRARY OpusFile_INCLUDE_PATH
31+
REQUIRED_VARS OpusFile_LIBRARY OpusFile_INCLUDE_PATH Ogg_FOUND
3032
)
3133

3234
if(OpusFile_FOUND)
@@ -38,7 +40,7 @@ if(OpusFile_FOUND)
3840
add_library(OpusFile::opusfile UNKNOWN IMPORTED)
3941
set_target_properties(OpusFile::opusfile PROPERTIES
4042
IMPORTED_LOCATION "${OpusFile_LIBRARY}"
41-
INTERFACE_INCLUDE_DIRECTORIES "${OpusFile_dirs};$<TARGET_PROPERTY>"
43+
INTERFACE_INCLUDE_DIRECTORIES "${OpusFile_dirs};${Ogg_dirs}"
4244
INTERFACE_COMPILE_OPTIONS "${OpusFile_COMPILE_OPTIONS}"
4345
INTERFACE_LINK_LIBRARIES "${OpusFile_LINK_LIBRARIES}"
4446
INTERFACE_LINK_OPTIONS "${OpusFile_LINK_OPTIONS}"

0 commit comments

Comments
 (0)