Skip to content

Commit 7ee417a

Browse files
committed
Simplify conditional linking with libdl
1 parent 24308ae commit 7ee417a

File tree

8 files changed

+8
-24
lines changed

8 files changed

+8
-24
lines changed

eqlaunch/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ IF(MINGW)
2727
ENDIF(MINGW)
2828

2929
IF(UNIX)
30-
IF(NOT FREEBSD)
31-
TARGET_LINK_LIBRARIES(eqlaunch "dl")
32-
ENDIF(NOT FREEBSD)
30+
TARGET_LINK_LIBRARIES(eqlaunch "${CMAKE_DL_LIBS}")
3331
TARGET_LINK_LIBRARIES(eqlaunch "z")
3432
TARGET_LINK_LIBRARIES(eqlaunch "m")
3533
TARGET_LINK_LIBRARIES(eqlaunch "rt")

loginserver/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ IF(MINGW)
5555
ENDIF(MINGW)
5656

5757
IF(UNIX)
58-
IF(NOT FREEBSD)
59-
TARGET_LINK_LIBRARIES(loginserver "dl")
60-
ENDIF(NOT FREEBSD)
58+
TARGET_LINK_LIBRARIES(loginserver "${CMAKE_DL_LIBS}")
6159
TARGET_LINK_LIBRARIES(loginserver "z")
6260
TARGET_LINK_LIBRARIES(loginserver "m")
6361
TARGET_LINK_LIBRARIES(loginserver "rt")

queryserv/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ IF(MINGW)
3333
ENDIF(MINGW)
3434

3535
IF(UNIX)
36-
IF(NOT FREEBSD)
37-
TARGET_LINK_LIBRARIES(queryserv "dl")
38-
ENDIF(NOT FREEBSD)
36+
TARGET_LINK_LIBRARIES(queryserv "${CMAKE_DL_LIBS}")
3937
TARGET_LINK_LIBRARIES(queryserv "z")
4038
TARGET_LINK_LIBRARIES(queryserv "m")
4139
TARGET_LINK_LIBRARIES(queryserv "rt")

shared_memory/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ IF(MINGW)
3333
ENDIF(MINGW)
3434

3535
IF(UNIX)
36-
IF(NOT FREEBSD)
37-
TARGET_LINK_LIBRARIES(shared_memory "dl")
38-
ENDIF(NOT FREEBSD)
36+
TARGET_LINK_LIBRARIES(shared_memory "${CMAKE_DL_LIBS}")
3937
TARGET_LINK_LIBRARIES(shared_memory "z")
4038
TARGET_LINK_LIBRARIES(shared_memory "m")
4139
TARGET_LINK_LIBRARIES(shared_memory "rt")

tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ IF(MINGW)
2727
ENDIF(MINGW)
2828

2929
IF(UNIX)
30-
TARGET_LINK_LIBRARIES(tests "dl")
30+
TARGET_LINK_LIBRARIES(tests "${CMAKE_DL_LIBS}")
3131
TARGET_LINK_LIBRARIES(tests "z")
3232
TARGET_LINK_LIBRARIES(tests "m")
3333
TARGET_LINK_LIBRARIES(tests "rt")

ucs/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ IF(MINGW)
3535
ENDIF(MINGW)
3636

3737
IF(UNIX)
38-
39-
IF(NOT FREEBSD)
40-
TARGET_LINK_LIBRARIES(ucs "dl")
41-
ENDIF(NOT FREEBSD)
38+
TARGET_LINK_LIBRARIES(ucs "${CMAKE_DL_LIBS}")
4239
TARGET_LINK_LIBRARIES(ucs "z")
4340
TARGET_LINK_LIBRARIES(ucs "m")
4441
TARGET_LINK_LIBRARIES(ucs "rt")

world/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,7 @@ IF(MINGW)
8181
ENDIF(MINGW)
8282

8383
IF(UNIX)
84-
85-
IF(NOT FREEBSD)
86-
TARGET_LINK_LIBRARIES(world "dl")
87-
ENDIF(NOT FREEBSD)
84+
TARGET_LINK_LIBRARIES(world "${CMAKE_DL_LIBS}")
8885
TARGET_LINK_LIBRARIES(world "z")
8986
TARGET_LINK_LIBRARIES(world "m")
9087
TARGET_LINK_LIBRARIES(world "rt")

zone/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,7 @@ IF(MINGW)
223223
ENDIF(MINGW)
224224

225225
IF(UNIX)
226-
IF(NOT FREEBSD)
227-
TARGET_LINK_LIBRARIES(zone "dl")
228-
ENDIF(NOT FREEBSD)
226+
TARGET_LINK_LIBRARIES(zone "${CMAKE_DL_LIBS}")
229227
TARGET_LINK_LIBRARIES(zone "z")
230228
TARGET_LINK_LIBRARIES(zone "m")
231229
TARGET_LINK_LIBRARIES(zone "rt")

0 commit comments

Comments
 (0)