Mercurial > vanilla

annotate games/wesnoth/patch-boost.patch @ 1341:9f35c15329d1 default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dev/meson: downgrade to 0.59.4 due to many regression
author David Demelier <markand@malikania.fr>
date Wed, 22 Dec 2021 21:52:57 +0100
parents 2e0fe4608012
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
807
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 --- src/CMakeLists.txt.orig 2019-08-12 14:47:12.719715645 +0000
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 +++ src/CMakeLists.txt 2019-08-12 15:16:25.083769473 +0000
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 @@ -55,11 +55,10 @@
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
4
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
5 set(common-external-libs
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
6 ${sdl-lib}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
7 - ${Boost_IOSTREAMS_LIBRARY}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
8 - ${Boost_REGEX_LIBRARY}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
9 - ${Boost_PROGRAM_OPTIONS_LIBRARY}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 - ${Boost_FILESYSTEM_LIBRARY}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
11 - ${Boost_LOCALE_LIBRARY}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
12 + Boost::iostreams
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
13 + Boost::regex
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 + Boost::filesystem
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
15 + Boost::locale
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
16 )
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
17
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
18 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
19 @@ -72,9 +71,10 @@
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
20 set(game-external-libs
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
21 ${common-external-libs}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
22 ${CRYPTO_LIBRARY}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
23 - ${Boost_SYSTEM_LIBRARIES}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
24 - ${Boost_RANDOM_LIBRARY}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
25 - ${Boost_THREAD_LIBRARY}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
26 + Boost::system
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
27 + Boost::thread
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
28 + Boost::program_options
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
29 + Boost::random
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
30 ${sdl_image-lib}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
31 ${sdl_mixer-lib}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
32 ${sdl_ttf-lib}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
33 @@ -94,16 +94,14 @@
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
34
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
35 set(server-external-libs
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
36 ${common-external-libs}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
37 - ${Boost_SYSTEM_LIBRARIES}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
38 + Boost::system
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
39 -lpthread
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
40 )
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
41
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
42 set(tools-external-libs
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
43 ${common-external-libs}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
44 ${sdl_image-lib}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
45 - ${Boost_FILESYSTEM_LIBRARY}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
46 - ${Boost_SYSTEM_LIBRARIES}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
47 - ${Boost_RANDOM_LIBRARY}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
48 + Boost::filesystem
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
49 )
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
50
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
51 if(ENABLE_FRIBIDI AND FRIBIDI_FOUND)
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
52 @@ -142,7 +140,7 @@
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
53 # a 'lib' is automatically set in front when creating the library (as in the filename)
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
54 # internal reference is the name given here
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
55 add_library(wesnoth-core ${LIBRARY_TYPE} EXCLUDE_FROM_ALL ${libwesnoth-core_STAT_SRC})
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
56 -target_link_libraries(wesnoth-core ${Boost_FILESYSTEM_LIBRARY})
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
57 +target_link_libraries(wesnoth-core Boost::filesystem)
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
58
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
59 # Depending on the flag create a real file or an empty dummy.
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
60 #
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
61 @@ -331,7 +329,6 @@
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
62 target_link_libraries(wesnothd
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
63 wesnoth-core
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
64 ${server-external-libs}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
65 - ${Boost_RANDOM_LIBRARY}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
66 ${CRYPTO_LIBRARY}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
67 ${MYSQL_LIBS}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
68 )
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
69 @@ -358,7 +355,6 @@
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
70 wesnoth-core
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
71 ${server-external-libs}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
72 ${CRYPTO_LIBRARY}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
73 - ${Boost_RANDOM_LIBRARY}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
74 ${MYSQL_LIBS}
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
75 )
2e0fe4608012 vanilla: add many missing files
David Demelier <markand@malikania.fr>
parents:
diff changeset
76 set_target_properties(campaignd PROPERTIES OUTPUT_NAME ${BINARY_PREFIX}campaignd${BINARY_SUFFIX})