[x265] [PATCH ] Fix Build fails for MacOS

[Pradeep Ramachandran]

On Fri, Nov 17, 2017 at 6:50 PM, <mythreyi at multicorewareinc.com> wrote:

> # HG changeset patch
> # User Mythreyi P
> # Date 1510905431 -19800
> #      Fri Nov 17 13:27:11 2017 +0530
> # Node ID e7254af562ee4cf29d559f85dbd2f3d17791b6d4
> # Parent  06979c0423504a324ea05ca3de59769c6d0fba0d
> Fix Build fails for MacOS
>
> Duplicate uninstall targets were removed.
>

Pushed to default. Thanks!


>
> diff -r 06979c042350 -r e7254af562ee source/CMakeLists.txt
> --- a/source/CMakeLists.txt     Thu Nov 16 20:23:14 2017 +0530
> +++ b/source/CMakeLists.txt     Fri Nov 17 13:27:11 2017 +0530
> @@ -650,13 +650,11 @@
>              DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
>  endif()
>
> -if(NOT WIN32)
>      configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmak
> e_uninstall.cmake.in"
>                     "${CMAKE_CURRENT_BINARY_DIR}/
> cmake/cmake_uninstall.cmake"
>                     IMMEDIATE @ONLY)
>      add_custom_target(uninstall
>                        "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/
> cmake/cmake_uninstall.cmake")
> -endif()
>
>  # Main CLI application
>  set(ENABLE_CLI ON CACHE BOOL "Build standalone CLI application")
> @@ -725,13 +723,3 @@
>          set(PLATFORM_LIBS ${PLATFORM_LIBS} PARENT_SCOPE)
>      endif(PLATFORM_LIBS)
>  endif(hasParent)
> -
> -# uninstall target
> -if(NOT TARGET UNINSTALL)
> -    configure_file(
> -        "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
> -        "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
> -        IMMEDIATE @ONLY)
> -    add_custom_target(UNINSTALL
> -        COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/
> cmake_uninstall.cmake)
> -endif()
> _______________________________________________
> x265-devel mailing list
> x265-devel at videolan.org
> https://mailman.videolan.org/listinfo/x265-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20171120/8f7aa2ad/attachment.html>