[gemrb] 01/06: DEBIAN: Remove unnecessary links against various libraries.

[Beren Minor]

This is an automated email from the git hooks/post-receive script.

berenm-guest pushed a commit to branch patch-queue/master
in repository gemrb.

commit 3d611d39b90c8b74bd255c940f7647c93e1597a2
Author: Beren Minor <beren.minor+git at gmail.com>
Date:   Fri Jan 2 01:21:02 2015 +0100

    DEBIAN: Remove unnecessary links against various libraries.
---
 gemrb/CMakeLists.txt      | 9 ++++-----
 gemrb/core/CMakeLists.txt | 4 ++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gemrb/CMakeLists.txt b/gemrb/CMakeLists.txt
index 3871f61..e2bd58e 100644
--- a/gemrb/CMakeLists.txt
+++ b/gemrb/CMakeLists.txt
@@ -105,18 +105,17 @@ ELSE(WIN32)
 
 	if (STATIC_LINK)
 		TARGET_LINK_LIBRARIES(gemrb
-			  ${COCOA_LIBRARY_PATH} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
+			  ${COCOA_LIBRARY_PATH}
 			 gemrb_core ${plugins}  -Wl,-all_load)
 	else (STATIC_LINK)
 		TARGET_LINK_LIBRARIES(gemrb gemrb_core
-			  ${COCOA_LIBRARY_PATH} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
+			  ${COCOA_LIBRARY_PATH})
 	endif (STATIC_LINK)
  ELSE(APPLE)
   if (STATIC_LINK)
-	  TARGET_LINK_LIBRARIES(gemrb ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
-		  -Wl,--whole-archive gemrb_core ${plugins} -Wl,--no-whole-archive)
+	  TARGET_LINK_LIBRARIES(gemrb -Wl,--whole-archive gemrb_core ${plugins} -Wl,--no-whole-archive)
   else (STATIC_LINK)
-	  TARGET_LINK_LIBRARIES(gemrb gemrb_core ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
+	  TARGET_LINK_LIBRARIES(gemrb gemrb_core)
   endif (STATIC_LINK)
  ENDIF(APPLE)
 ENDIF(WIN32)
diff --git a/gemrb/core/CMakeLists.txt b/gemrb/core/CMakeLists.txt
index 46f3141..a6c07bd 100644
--- a/gemrb/core/CMakeLists.txt
+++ b/gemrb/core/CMakeLists.txt
@@ -156,6 +156,10 @@ else (STATIC_LINK)
 	ENDIF(WIN32)
 endif (STATIC_LINK)
 
+IF(NOT WIN32)
+	TARGET_LINK_LIBRARIES(gemrb_core ${CMAKE_DL_LIBS})
+ENDIF(NOT WIN32)
+
 # make lintian happy
 SET_TARGET_PROPERTIES(gemrb_core PROPERTIES
 	VERSION "${GEMRB_VERSION}"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gemrb.git