[SCM] crtmpserver/master: Additional fixup on 20_use_pkgconfig_for_tinyxml

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b7970b00565e79b82bab1be202b8215f0e0d7099
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jun 22 18:08:56 2013 +0200

    Additional fixup on 20_use_pkgconfig_for_tinyxml
    
    Using pkg-config diverges from the standard cmake variables names, so
    additional CMakeLists.txt files have to be adapted

diff --git a/debian/patches/20_use_pkgconfig_for_tinyxml.diff b/debian/patches/20_use_pkgconfig_for_tinyxml.diff
index 8105bd8..c6e99af 100644
--- a/debian/patches/20_use_pkgconfig_for_tinyxml.diff
+++ b/debian/patches/20_use_pkgconfig_for_tinyxml.diff
@@ -34,3 +34,34 @@ Tinyxml ships a working pkg-config file, so let's use that one for now.
  ENDIF($ENV{COMPILE_STATIC} MATCHES "1")
  
  #disable file/line/function inside logging
+--- a/common/CMakeLists.txt
++++ b/common/CMakeLists.txt
+@@ -6,7 +6,7 @@ FILE(GLOB_RECURSE SOURCES "${CRTMPSERVER
+ 
+ #prepare the include directories
+ INCLUDE_DIRECTORIES(
+-	${TINYXML_INCLUDE_PATH}
++	${TINYXML_INCLUDE_DIRS}
+ 	${OPENSSL_INCLUDE_PATH}
+ 	${LUA_INCLUDE_PATH}
+ 	${CRTMPSERVER_SOURCES_ROOT}/common/include
+@@ -19,7 +19,7 @@ IF(${LIB_TYPE} MATCHES "SHARED")
+ 	TARGET_LINK_LIBRARIES(
+ 		${PROJECT_NAME} 
+ 		${LUA_LIBRARY_PATH} 
+-		${TINYXML_LIBRARY_PATH} 
++		${TINYXML_LIBRARIES}
+ 		${OPENSSL_LIBRARY_PATH} 
+ 		${CRYPTO_LIBRARY_PATH} 
+ 		${Z_LIBRARY_PATH}
+--- a/crtmpserver/CMakeLists.txt
++++ b/crtmpserver/CMakeLists.txt
+@@ -23,7 +23,7 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME}
+ 	${APPS_LIBS}
+ 	thelib
+ 	common
+-	${TINYXML_LIBRARY_PATH}
++	${TINYXML_LIBRARIES}
+ 	${LUA_LIBRARY_PATH}
+ 	${OPENSSL_LIBRARY_PATH}
+ 	${CRYPTO_LIBRARY_PATH}

-- 
crtmpserver packaging