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 4a3a81a4f8e9f64706b3ea164d57f89cbff950ad Author: Beren Minor <[email protected]> Date: Fri Jun 1 21:19:34 2012 +0200 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 1739f44..fbb897d 100644 --- a/gemrb/CMakeLists.txt +++ b/gemrb/CMakeLists.txt @@ -81,18 +81,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 81dbdc2..33399d1 100644 --- a/gemrb/core/CMakeLists.txt +++ b/gemrb/core/CMakeLists.txt @@ -151,6 +151,10 @@ else (STATIC_LINK) ENDIF(WIN32) endif (STATIC_LINK) +IF(NOT WIN32) + TARGET_LINK_LIBRARIES(gemrb_core ${CMAKE_DL_LIBS}) +ENDIF(NOT WIN32) + STRING(REGEX REPLACE "\\..*$" "" GEMRB_SOVERSION "${GEMRB_VERSION}") SET_TARGET_PROPERTIES(gemrb_core PROPERTIES COMPILE_DEFINITIONS -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gemrb.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
