File tree Expand file tree Collapse file tree 2 files changed +4
-6
lines changed Expand file tree Collapse file tree 2 files changed +4
-6
lines changed Original file line number Diff line number Diff line change @@ -468,7 +468,6 @@ if(SDL3MIXER_OPUS)
468
468
endif ()
469
469
else ()
470
470
find_package (OpusFile ${required} )
471
- find_package (Ogg ${required} )
472
471
if (OpusFile_FOUND AND Ogg_FOUND )
473
472
set (SDL3MIXER_OPUS_ENABLED TRUE )
474
473
message (STATUS "Using system opusfile" )
@@ -486,9 +485,6 @@ if(SDL3MIXER_OPUS)
486
485
$< TARGET_PROPERTY:OpusFile::opusfile,INCLUDE_DIRECTORIES>
487
486
$< TARGET_PROPERTY:OpusFile::opusfile,INTERFACE_INCLUDE_DIRECTORIES>
488
487
$< 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>
492
488
)
493
489
target_get_dynamic_library (dynamic_opusfile OpusFile::opusfile )
494
490
message (STATUS "Dynamic opus (opusfile): ${dynamic_opusfile} " )
Original file line number Diff line number Diff line change @@ -25,8 +25,10 @@ set(OpusFile_LINK_OPTIONS "${_opusfile_link_options}" CACHE STRING "Extra link f
25
25
26
26
set (OpusFile_LINK_DIRECTORIES "${_opusfile_link_directories} " CACHE PATH "Extra link directories of opusfile" )
27
27
28
+ find_package (Ogg ${required} )
29
+
28
30
find_package_handle_standard_args (OpusFile
29
- REQUIRED_VARS OpusFile_LIBRARY OpusFile_INCLUDE_PATH
31
+ REQUIRED_VARS OpusFile_LIBRARY OpusFile_INCLUDE_PATH Ogg_FOUND
30
32
)
31
33
32
34
if (OpusFile_FOUND )
@@ -38,7 +40,7 @@ if(OpusFile_FOUND)
38
40
add_library (OpusFile::opusfile UNKNOWN IMPORTED )
39
41
set_target_properties (OpusFile::opusfile PROPERTIES
40
42
IMPORTED_LOCATION "${OpusFile_LIBRARY} "
41
- INTERFACE_INCLUDE_DIRECTORIES "${OpusFile_dirs} ;$<TARGET_PROPERTY> "
43
+ INTERFACE_INCLUDE_DIRECTORIES "${OpusFile_dirs} ;${Ogg_dirs} "
42
44
INTERFACE_COMPILE_OPTIONS "${OpusFile_COMPILE_OPTIONS} "
43
45
INTERFACE_LINK_LIBRARIES "${OpusFile_LINK_LIBRARIES} "
44
46
INTERFACE_LINK_OPTIONS "${OpusFile_LINK_OPTIONS} "
You can’t perform that action at this time.
0 commit comments