summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2023-12-06 20:07:41 +0800
committerErik Kundiman <erik@megapahit.org>2023-12-06 20:07:41 +0800
commitd39bf72d8ff6ead41486ed8df4214d2300b8568a (patch)
tree261c3973847a86398d657b60d86b386a5516d549
parente1e37228f7542e46bd75c5f3519ffea56bbd7262 (diff)
The VLC used on macOS is the one in /Applications
-rw-r--r--indra/cmake/LibVLCPlugin.cmake14
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/cmake/LibVLCPlugin.cmake b/indra/cmake/LibVLCPlugin.cmake
index f4ec34ec1b..66dc13d126 100644
--- a/indra/cmake/LibVLCPlugin.cmake
+++ b/indra/cmake/LibVLCPlugin.cmake
@@ -10,17 +10,17 @@ use_prebuilt_binary(vlc-bin)
set(LIBVLCPLUGIN ON CACHE BOOL
"LIBVLCPLUGIN support for the llplugin/llmedia test apps.")
else ()
- include(FindPkgConfig)
if (DARWIN)
- set(CMAKE_PREFIX_PATH "/opt/local/libexec/vlc3/lib/pkgconfig")
- pkg_check_modules(Libvlc REQUIRED libvlc)
- target_link_libraries( ll::libvlc INTERFACE vlccore )
+ target_include_directories( ll::libvlc SYSTEM INTERFACE /Applications/VLC.app/Contents/MacOS/include)
+ target_link_directories( ll::libvlc INTERFACE /Applications/VLC.app/Contents/MacOS/lib)
+ target_link_libraries( ll::libvlc INTERFACE vlc vlccore )
else ()
+ include(FindPkgConfig)
pkg_check_modules(Libvlc REQUIRED libvlc vlc-plugin)
+ target_include_directories( ll::libvlc SYSTEM INTERFACE ${Libvlc_INCLUDE_DIRS} )
+ target_link_directories( ll::libvlc INTERFACE ${Libvlc_LIBRARY_DIRS} )
+ target_link_libraries( ll::libvlc INTERFACE ${Libvlc_LIBRARIES} )
endif ()
- target_include_directories( ll::libvlc SYSTEM INTERFACE ${Libvlc_INCLUDE_DIRS} )
- target_link_directories( ll::libvlc INTERFACE ${Libvlc_LIBRARY_DIRS} )
- target_link_libraries( ll::libvlc INTERFACE ${Libvlc_LIBRARIES} )
set(LIBVLCPLUGIN ON CACHE BOOL
"LIBVLCPLUGIN support for the llplugin/llmedia test apps.")
return()