1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From: Beren Minor <beren.minor+git@gmail.com>
Date: Fri, 1 Jun 2012 21:19:34 +0200
Subject: 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 d2fa234..992bbad 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 be592f9..0c493e0 100644
--- a/gemrb/core/CMakeLists.txt
+++ b/gemrb/core/CMakeLists.txt
@@ -152,6 +152,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
VERSION ${GEMRB_VERSION}
|
