Re: [x265] [PATCH ] Fix install symbol files

2017-11-19 Thread Pradeep Ramachandran
On Fri, Nov 17, 2017 at 6:50 PM,  wrote:

> # HG changeset patch
> # User Mythreyi P
> # Date 1510910772 -19800
> #  Fri Nov 17 14:56:12 2017 +0530
> # Node ID 4ad31bed996f295f0ef1049f45a19bf326811afb
> # Parent  e7254af562ee4cf29d559f85dbd2f3d17791b6d4
> Fix install symbol files
>
> .pdb files are installed only in Windows.
>

Pushed to default. Thanks!


>
> diff -r e7254af562ee -r 4ad31bed996f source/CMakeLists.txt
> --- a/source/CMakeLists.txt Fri Nov 17 13:27:11 2017 +0530
> +++ b/source/CMakeLists.txt Fri Nov 17 14:56:12 2017 +0530
> @@ -546,10 +546,14 @@
>  ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
>  endif()
>  install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION
> include)
> -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)
> -install(FILES "${PROJECT_BINARY_DIR}/Debug/libx265.pdb" DESTINATION
> ${BIN_INSTALL_DIR} CONFIGURATIONS Debug OPTIONAL NAMELINK_ONLY)
> -install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/libx265.pdb"
> DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo OPTIONAL
> NAMELINK_ONLY)
> +
> +if(WIN32)
> +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)
> +install(FILES "${PROJECT_BINARY_DIR}/Debug/libx265.pdb" DESTINATION
> ${BIN_INSTALL_DIR} CONFIGURATIONS Debug OPTIONAL NAMELINK_ONLY)
> +install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/libx265.pdb"
> DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo OPTIONAL
> NAMELINK_ONLY)
> +endif()
> +
>  if(CMAKE_RC_COMPILER)
>  # The resource compiler does not need CFLAGS or macro defines. It
>  # often breaks them
> ___
> x265-devel mailing list
> x265-devel@videolan.org
> https://mailman.videolan.org/listinfo/x265-devel
>
___
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel


[x265] [PATCH ] Fix install symbol files

2017-11-17 Thread mythreyi
# HG changeset patch
# User Mythreyi P
# Date 1510910772 -19800
#  Fri Nov 17 14:56:12 2017 +0530
# Node ID 4ad31bed996f295f0ef1049f45a19bf326811afb
# Parent  e7254af562ee4cf29d559f85dbd2f3d17791b6d4
Fix install symbol files

.pdb files are installed only in Windows.

diff -r e7254af562ee -r 4ad31bed996f source/CMakeLists.txt
--- a/source/CMakeLists.txt Fri Nov 17 13:27:11 2017 +0530
+++ b/source/CMakeLists.txt Fri Nov 17 14:56:12 2017 +0530
@@ -546,10 +546,14 @@
 ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
 endif()
 install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)
-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)
-install(FILES "${PROJECT_BINARY_DIR}/Debug/libx265.pdb" DESTINATION 
${BIN_INSTALL_DIR} CONFIGURATIONS Debug OPTIONAL NAMELINK_ONLY)
-install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/libx265.pdb" DESTINATION 
${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo OPTIONAL NAMELINK_ONLY)
+
+if(WIN32)
+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)
+install(FILES "${PROJECT_BINARY_DIR}/Debug/libx265.pdb" DESTINATION 
${BIN_INSTALL_DIR} CONFIGURATIONS Debug OPTIONAL NAMELINK_ONLY)
+install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/libx265.pdb" 
DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo OPTIONAL 
NAMELINK_ONLY)
+endif()
+
 if(CMAKE_RC_COMPILER)
 # The resource compiler does not need CFLAGS or macro defines. It
 # often breaks them
___
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel