[vlmc-devel] [PATCH] CMakeLists: Use LIBVLC_LIBRARY_DIRS on OS X

yikei lu luyikei.qmltu at gmail.com
Sat Jul 30 07:37:28 CEST 2016


Looks good to me ! I'll merge this. Thanks!

2016-07-30 2:05 GMT+09:00 Paweł Goliński <golpaw1 at gmail.com>:
> Please merge this!
>
>> Wiadomość napisana przez Pawel Golinski <golpaw1 at gmail.com> w dniu 20.07.2016, o godz. 22:45:
>>
>> ---
>> src/CMakeLists.txt | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
>> index a85cf0a..7b37f38 100644
>> --- a/src/CMakeLists.txt
>> +++ b/src/CMakeLists.txt
>> @@ -314,14 +314,14 @@ ENDIF(UNIX)
>>
>> if( APPLE )
>>     set(APPLICATION_BUNDLE ${CMAKE_BINARY_DIR}/bin/vlmc.app)
>> -    set(APPLICATION_LIB_DIR ${LIBVLC_LIB_DIR})
>> +    set(APPLICATION_LIB_DIR ${LIBVLC_LIBRARY_DIRS})
>>
>>     # re-enable this when we start addressing redistribution
>>     # message(STATUS "Looking for bundle ${APPLICATION_BUNDLE} with library path ${APPLICATION_LIB_DIR}")
>>     # install(CODE "include(BundleUtilities)
>>     add_custom_command(TARGET vlmc
>>         POST_BUILD
>> -        COMMAND ${CMAKE_SOURCE_DIR}/cmake/FixBundle.sh ${APPLICATION_BUNDLE}/Contents/MacOS ${LIBVLC_LIB_DIR}
>> +        COMMAND ${CMAKE_SOURCE_DIR}/cmake/FixBundle.sh ${APPLICATION_BUNDLE}/Contents/MacOS ${LIBVLC_LIBRARY_DIRS}
>>         COMMENT "Fixing application bundle for local run")
>>     # fixup_bundle(\"${APPLICATION_BUNDLE}\" \"\" \"${APPLICATION_LIB_DIR}\")" COMPONENT Runtime)
>> endif()
>> --
>> 2.7.4 (Apple Git-66)
>>
>
> _______________________________________________
> Vlmc-devel mailing list
> Vlmc-devel at videolan.org
> https://mailman.videolan.org/listinfo/vlmc-devel


More information about the Vlmc-devel mailing list