upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-18 15:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove tools-external-libs.

Browse Source 
Also put Boost_RANDOM_LIBRARY, CRYPTO_LIBRARY, and MYSQL_LIBS into server-external-libs.

(cherry-picked from commit 0bbc78945ee9945be708396f71d80d3869a31951)
This commit is contained in:
pentarctagon 2018-03-27 18:44:24 -05:00 committed by Pentarctagon
parent d9bfb7511c
commit eed7e5d8c6
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/CMakeLists.txt
View File

@ -94,14 +94,9 @@ endif(ENABLE_HISTORY AND HISTORY_FOUND)
set(server-external-libs set(server-external-libs
${common-external-libs} ${common-external-libs}
${Boost_SYSTEM_LIBRARIES} ${Boost_SYSTEM_LIBRARIES}
)
set(tools-external-libs
${common-external-libs}
${sdl_image-lib}
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARIES}
${Boost_RANDOM_LIBRARY} ${Boost_RANDOM_LIBRARY}
${CRYPTO_LIBRARY}
${MYSQL_LIBS}
) )
if(ENABLE_FRIBIDI AND FRIBIDI_FOUND) if(ENABLE_FRIBIDI AND FRIBIDI_FOUND)
@ -319,9 +314,6 @@ if(ENABLE_SERVER)
target_link_libraries(wesnothd target_link_libraries(wesnothd
wesnoth-core wesnoth-core
${server-external-libs} ${server-external-libs}
${Boost_RANDOM_LIBRARY}
${CRYPTO_LIBRARY}
${MYSQL_LIBS}
) )
set_target_properties(wesnothd PROPERTIES OUTPUT_NAME ${BINARY_PREFIX}wesnothd${BINARY_SUFFIX}) set_target_properties(wesnothd PROPERTIES OUTPUT_NAME ${BINARY_PREFIX}wesnothd${BINARY_SUFFIX})
@ -345,9 +337,6 @@ if(ENABLE_CAMPAIGN_SERVER)
target_link_libraries(campaignd target_link_libraries(campaignd
wesnoth-core wesnoth-core
${server-external-libs} ${server-external-libs}
${CRYPTO_LIBRARY}
${Boost_RANDOM_LIBRARY}
${MYSQL_LIBS}
) )
set_target_properties(campaignd PROPERTIES OUTPUT_NAME ${BINARY_PREFIX}campaignd${BINARY_SUFFIX}) set_target_properties(campaignd PROPERTIES OUTPUT_NAME ${BINARY_PREFIX}campaignd${BINARY_SUFFIX})