cmake: don't use Ogg::Ogg

libsdl-org · Jan 12, 2024 · 17b9bb4 · 17b9bb4
1 parent f89dc78
commit 17b9bb4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -468,7 +468,6 @@ if(SDL3MIXER_OPUS)
         endif()
     else()
         find_package(OpusFile ${required})
-        find_package(Ogg ${required})
         if(OpusFile_FOUND AND Ogg_FOUND)
             set(SDL3MIXER_OPUS_ENABLED TRUE)
             message(STATUS "Using system opusfile")
@@ -486,9 +485,6 @@ if(SDL3MIXER_OPUS)
                 $<TARGET_PROPERTY:OpusFile::opusfile,INCLUDE_DIRECTORIES>
                 $<TARGET_PROPERTY:OpusFile::opusfile,INTERFACE_INCLUDE_DIRECTORIES>
                 $<TARGET_PROPERTY:OpusFile::opusfile,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
-                $<TARGET_PROPERTY:Ogg::Ogg,INCLUDE_DIRECTORIES>
-                $<TARGET_PROPERTY:Ogg::Ogg,INTERFACE_INCLUDE_DIRECTORIES>
-                $<TARGET_PROPERTY:Ogg::Ogg,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
             )
             target_get_dynamic_library(dynamic_opusfile OpusFile::opusfile)
             message(STATUS "Dynamic opus (opusfile): ${dynamic_opusfile}")

diff --git a/cmake/FindOpusFile.cmake b/cmake/FindOpusFile.cmake
@@ -25,8 +25,10 @@ set(OpusFile_LINK_OPTIONS "${_opusfile_link_options}" CACHE STRING "Extra link f
 
 set(OpusFile_LINK_DIRECTORIES "${_opusfile_link_directories}" CACHE PATH "Extra link directories of opusfile")
 
+find_package(Ogg ${required})
+
 find_package_handle_standard_args(OpusFile
-    REQUIRED_VARS OpusFile_LIBRARY OpusFile_INCLUDE_PATH
+    REQUIRED_VARS OpusFile_LIBRARY OpusFile_INCLUDE_PATH Ogg_FOUND
 )
 
 if(OpusFile_FOUND)
@@ -38,7 +40,7 @@ if(OpusFile_FOUND)
         add_library(OpusFile::opusfile UNKNOWN IMPORTED)
         set_target_properties(OpusFile::opusfile PROPERTIES
             IMPORTED_LOCATION "${OpusFile_LIBRARY}"
-            INTERFACE_INCLUDE_DIRECTORIES "${OpusFile_dirs};$<TARGET_PROPERTY>"
+            INTERFACE_INCLUDE_DIRECTORIES "${OpusFile_dirs};${Ogg_dirs}"
             INTERFACE_COMPILE_OPTIONS "${OpusFile_COMPILE_OPTIONS}"
             INTERFACE_LINK_LIBRARIES "${OpusFile_LINK_LIBRARIES}"
             INTERFACE_LINK_OPTIONS "${OpusFile_LINK_OPTIONS}"