Remove tools-external-libs.
Also put Boost_RANDOM_LIBRARY, CRYPTO_LIBRARY, and MYSQL_LIBS into server-external-libs.
(cherry-picked from commit 0bbc78945e
)
This commit is contained in:
parent
d9bfb7511c
commit
eed7e5d8c6
1 changed files with 2 additions and 13 deletions
|
@ -94,14 +94,9 @@ endif(ENABLE_HISTORY AND HISTORY_FOUND)
|
|||
set(server-external-libs
|
||||
${common-external-libs}
|
||||
${Boost_SYSTEM_LIBRARIES}
|
||||
)
|
||||
|
||||
set(tools-external-libs
|
||||
${common-external-libs}
|
||||
${sdl_image-lib}
|
||||
${Boost_FILESYSTEM_LIBRARY}
|
||||
${Boost_SYSTEM_LIBRARIES}
|
||||
${Boost_RANDOM_LIBRARY}
|
||||
${CRYPTO_LIBRARY}
|
||||
${MYSQL_LIBS}
|
||||
)
|
||||
|
||||
if(ENABLE_FRIBIDI AND FRIBIDI_FOUND)
|
||||
|
@ -319,9 +314,6 @@ if(ENABLE_SERVER)
|
|||
target_link_libraries(wesnothd
|
||||
wesnoth-core
|
||||
${server-external-libs}
|
||||
${Boost_RANDOM_LIBRARY}
|
||||
${CRYPTO_LIBRARY}
|
||||
${MYSQL_LIBS}
|
||||
)
|
||||
set_target_properties(wesnothd PROPERTIES OUTPUT_NAME ${BINARY_PREFIX}wesnothd${BINARY_SUFFIX})
|
||||
|
||||
|
@ -345,9 +337,6 @@ if(ENABLE_CAMPAIGN_SERVER)
|
|||
target_link_libraries(campaignd
|
||||
wesnoth-core
|
||||
${server-external-libs}
|
||||
${CRYPTO_LIBRARY}
|
||||
${Boost_RANDOM_LIBRARY}
|
||||
${MYSQL_LIBS}
|
||||
)
|
||||
set_target_properties(campaignd PROPERTIES OUTPUT_NAME ${BINARY_PREFIX}campaignd${BINARY_SUFFIX})
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue