[vlc-commits] contrib: harfbuzz: don't build tests on winstore builds

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu May 24 15:17:02 2018 +0200| [c3492c870c9d91f0bc52a583bef3936cb01fd749] | committer: Hugo Beauzée-Luyssen

contrib: harfbuzz: don't build tests on winstore builds

it tries to link with .lib files

(cherry picked from commit b9341db73d42ef8773a545d5e946c9cfe067537e)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=c3492c870c9d91f0bc52a583bef3936cb01fd749
---

 contrib/src/harfbuzz/harfbuzz-no-tests.patch | 18 ++++++++++++++++++
 contrib/src/harfbuzz/rules.mak               |  1 +
 2 files changed, 19 insertions(+)

diff --git a/contrib/src/harfbuzz/harfbuzz-no-tests.patch b/contrib/src/harfbuzz/harfbuzz-no-tests.patch
new file mode 100644
index 0000000000..5ba52030da
--- /dev/null
+++ b/contrib/src/harfbuzz/harfbuzz-no-tests.patch
@@ -0,0 +1,18 @@
+--- harfbuzz/CMakeLists.txt.notests	2018-05-24 15:14:05.682443200 +0200
++++ harfbuzz/CMakeLists.txt	2018-05-24 15:14:17.437916300 +0200
+@@ -808,6 +808,7 @@ endif ()
+ 
+ 
+ ## src/ executables
++if(NOT WIN32 OR NOT ${CMAKE_SYSTEM_NAME} MATCHES "WindowsStore")
+ foreach (prog main test test-would-substitute test-size-params test-buffer-serialize hb-ot-tag test-unicode-ranges)
+   set (prog_name ${prog})
+   if (${prog_name} STREQUAL "test")
+@@ -818,6 +819,7 @@ foreach (prog main test test-would-subst
+   target_link_libraries(${prog_name} harfbuzz ${THIRD_PARTY_LIBS})
+ endforeach ()
+ set_target_properties(hb-ot-tag PROPERTIES COMPILE_FLAGS "-DMAIN")
++endif()
+ 
+ ## Tests
+ if (UNIX OR MINGW)
diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index c8695afdae..446a926566 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -19,6 +19,7 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz
 	$(APPLY) $(SRC)/harfbuzz/harfbuzz-fix-freetype-detect.patch
 	$(APPLY) $(SRC)/harfbuzz/harfbuzz-fix-coretext-detection.patch
 	$(APPLY) $(SRC)/harfbuzz/harfbuzz-create-pkgconfig-file.patch
+	$(APPLY) $(SRC)/harfbuzz/harfbuzz-no-tests.patch
 	$(MOVE)
 
 DEPS_harfbuzz = freetype2 $(DEPS_freetype2)