Mercurial > vanilla
diff games/wesnoth/patch-boost.patch @ 807:2e0fe4608012
vanilla: add many missing files
author | David Demelier <markand@malikania.fr> |
---|---|
date | Sun, 18 Aug 2019 22:22:21 +0200 |
parents | |
children |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/games/wesnoth/patch-boost.patch Sun Aug 18 22:22:21 2019 +0200 @@ -0,0 +1,76 @@ +--- src/CMakeLists.txt.orig 2019-08-12 14:47:12.719715645 +0000 ++++ src/CMakeLists.txt 2019-08-12 15:16:25.083769473 +0000 +@@ -55,11 +55,10 @@ + + set(common-external-libs + ${sdl-lib} +- ${Boost_IOSTREAMS_LIBRARY} +- ${Boost_REGEX_LIBRARY} +- ${Boost_PROGRAM_OPTIONS_LIBRARY} +- ${Boost_FILESYSTEM_LIBRARY} +- ${Boost_LOCALE_LIBRARY} ++ Boost::iostreams ++ Boost::regex ++ Boost::filesystem ++ Boost::locale + ) + + if(CMAKE_SYSTEM_NAME STREQUAL "Linux") +@@ -72,9 +71,10 @@ + set(game-external-libs + ${common-external-libs} + ${CRYPTO_LIBRARY} +- ${Boost_SYSTEM_LIBRARIES} +- ${Boost_RANDOM_LIBRARY} +- ${Boost_THREAD_LIBRARY} ++ Boost::system ++ Boost::thread ++ Boost::program_options ++ Boost::random + ${sdl_image-lib} + ${sdl_mixer-lib} + ${sdl_ttf-lib} +@@ -94,16 +94,14 @@ + + set(server-external-libs + ${common-external-libs} +- ${Boost_SYSTEM_LIBRARIES} ++ Boost::system + -lpthread + ) + + set(tools-external-libs + ${common-external-libs} + ${sdl_image-lib} +- ${Boost_FILESYSTEM_LIBRARY} +- ${Boost_SYSTEM_LIBRARIES} +- ${Boost_RANDOM_LIBRARY} ++ Boost::filesystem + ) + + if(ENABLE_FRIBIDI AND FRIBIDI_FOUND) +@@ -142,7 +140,7 @@ + # a 'lib' is automatically set in front when creating the library (as in the filename) + # internal reference is the name given here + add_library(wesnoth-core ${LIBRARY_TYPE} EXCLUDE_FROM_ALL ${libwesnoth-core_STAT_SRC}) +-target_link_libraries(wesnoth-core ${Boost_FILESYSTEM_LIBRARY}) ++target_link_libraries(wesnoth-core Boost::filesystem) + + # Depending on the flag create a real file or an empty dummy. + # +@@ -331,7 +329,6 @@ + target_link_libraries(wesnothd + wesnoth-core + ${server-external-libs} +- ${Boost_RANDOM_LIBRARY} + ${CRYPTO_LIBRARY} + ${MYSQL_LIBS} + ) +@@ -358,7 +355,6 @@ + wesnoth-core + ${server-external-libs} + ${CRYPTO_LIBRARY} +- ${Boost_RANDOM_LIBRARY} + ${MYSQL_LIBS} + ) + set_target_properties(campaignd PROPERTIES OUTPUT_NAME ${BINARY_PREFIX}campaignd${BINARY_SUFFIX})