[vlc-commits] contrib: srt: fix compilation when the CMAKE_CXX_COMPILER_ID is not found

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed May 23 10:27:51 2018 +0200| [c8cb2a6eaa7d409f3bb61a828f31fac9c513b6e7] | committer: Steve Lhomme

contrib: srt: fix compilation when the CMAKE_CXX_COMPILER_ID is not found

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

 contrib/src/srt/rules.mak                     |  1 +
 contrib/src/srt/srt-fix-compiler-detect.patch | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/contrib/src/srt/rules.mak b/contrib/src/srt/rules.mak
index 6807b4a7b1..604a83c585 100644
--- a/contrib/src/srt/rules.mak
+++ b/contrib/src/srt/rules.mak
@@ -37,6 +37,7 @@ ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/srt/0002-CMakeLists.txt-let-cmake-find-pthread.patch
 	$(APPLY) $(SRC)/srt/srt-no-implicit-libs.patch 
 endif
+	$(APPLY) $(SRC)/srt/srt-fix-compiler-detect.patch
 	$(call pkg_static,"scripts/haisrt.pc.in")
 	mv srt-$(SRT_VERSION) $@ && touch $@
 
diff --git a/contrib/src/srt/srt-fix-compiler-detect.patch b/contrib/src/srt/srt-fix-compiler-detect.patch
new file mode 100644
index 0000000000..34fa833de0
--- /dev/null
+++ b/contrib/src/srt/srt-fix-compiler-detect.patch
@@ -0,0 +1,23 @@
+--- srt/CMakeLists.txt.msvc-detect	2018-05-23 08:55:10.318208300 +0200
++++ srt/CMakeLists.txt	2018-05-18 13:33:40.442158800 +0200
+@@ -115,12 +115,14 @@ message (STATUS "SSL libraries: ${SSL_LI
+ 
+ # Detect if the compiler is GNU compatable for flags
+ set(HAVE_COMPILER_GNU_COMPAT 0)
+-foreach (gnid GNU Intel Clang AppleClang)
+-	if (${CMAKE_CXX_COMPILER_ID} STREQUAL ${gnid})
+-		set(HAVE_COMPILER_GNU_COMPAT 1)
+-		break()
+-	endif()
+-endforeach()
++if ( CMAKE_CXX_COMPILER_ID )
++	foreach (gnid GNU Intel Clang AppleClang)
++		if (${CMAKE_CXX_COMPILER_ID} STREQUAL ${gnid})
++			set(HAVE_COMPILER_GNU_COMPAT 1)
++			break()
++		endif()
++	endforeach()
++endif()
+ 
+ if (DISABLE_CXX11)
+ 	set (ENABLE_CXX11 0)