contrib: x265: do not copy .pdb files that don't exist
authorSteve Lhomme <robux4@ycbcr.xyz>
Fri, 18 May 2018 14:32:17 +0000 (16:32 +0200)
committerSteve Lhomme <robux4@ycbcr.xyz>
Fri, 18 May 2018 14:37:42 +0000 (16:37 +0200)
contrib/src/x265/rules.mak
contrib/src/x265/x265-no-pdb-install.patch [new file with mode: 0644]

index cf53f52..01859b9 100644 (file)
@@ -27,6 +27,7 @@ x265: x265-$(X265_VERSION).tar.bz2 .sum-x265
        mkdir -p $@-$(X265_VERSION)
        tar xvjf "$<" --strip-components=1 -C $@-$(X265_VERSION)
        $(APPLY) $(SRC)/x265/x265-ldl-linking.patch
+       $(APPLY) $(SRC)/x265/x265-no-pdb-install.patch
        $(call pkg_static,"source/x265.pc.in")
 ifndef HAVE_WIN32
        $(APPLY) $(SRC)/x265/x265-pkg-libs.patch
diff --git a/contrib/src/x265/x265-no-pdb-install.patch b/contrib/src/x265/x265-no-pdb-install.patch
new file mode 100644 (file)
index 0000000..38ed618
--- /dev/null
@@ -0,0 +1,11 @@
+--- x265/source/CMakeLists.txt.nopdb   2018-05-18 16:28:43.150790700 +0200
++++ x265/source/CMakeLists.txt 2018-05-18 16:28:53.838634400 +0200
+@@ -546,7 +546,7 @@ if(ENABLE_HDR10_PLUS)
+         ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
+ endif()
+ install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)
+-if(WIN32)
++if(WIN32 AND MSVC_IDE)
+     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)