[x265] Fwd: Fix build issues

[Pradeep Ramachandran]

On Mon, Jun 4, 2018 at 8:13 AM, Aarthi Priya Thirumalai <
aarthi at multicorewareinc.com> wrote:

>
> # HG changeset patch
> # User Radhakrishnan <radhakrishnan at multicorewareinc.com>
> # Date 1527845200 -19800
> #      Fri Jun 01 14:56:40 2018 +0530
> # Node ID ef02ddaad3dcc07a7750989b21878f82cd6c2f97
> # Parent  9cde2c278464be0db96d41f9605a2dc7a3137165
> Fixes cmake error "cannot find x265.pdb" when installing files for static
> debug build provided enable_cli is off.
>

Thanks. Looks like this was an issue on stable branch also.
I've pushed the fix into stable branch and merged stable with default.


>
> diff -r 9cde2c278464 -r ef02ddaad3dc source/CMakeLists.txt
> --- a/source/CMakeLists.txt Wed May 30 20:54:07 2018 +0530
> +++ b/source/CMakeLists.txt Fri Jun 01 14:56:40 2018 +0530
> @@ -554,7 +554,7 @@
>          ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
>  endif()
>  install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION
> include)
> -if(WIN32)
> +if((WIN32 AND ENABLE_CLI) OR (WIN32 AND ENABLE_SHARED))
>      if(MSVC_IDE)
>          install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION
> ${BIN_INSTALL_DIR} CONFIGURATIONS Debug)
>          install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/x265.pdb"
> DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo)
>
>
>
> _______________________________________________
> 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/20180604/eea3e914/attachment.html>