[vlmc-devel] [PATCH] CMakeLists: Use LIBVLC_LIBRARY_DIRS on OS X
Hugo Beauzée-Luyssen
hugo at beauzee.fr
Sun Jul 31 17:38:30 CEST 2016
On 07/29/2016 07:05 PM, Paweł Goliński wrote:
> 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
>
Thanks for fixing the cmake buildsystem, however the reason I was
reluctant at merging this is because I'd like to have the autotools
branch merged to master.
Speaking of which, did you have a chance to try it out on macOS?
Regards,
--
Hugo Beauzée-Luyssen
www.beauzee.fr
More information about the Vlmc-devel
mailing list