Hide warnings when building with boost >= 1.73

wesnoth · Dec 16, 2020 · edcfa55 · edcfa55
1 parent 859bfc5
commit edcfa55
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,6 +36,8 @@ if(NOT MSVC)
 	add_definitions(${SDL_CFLAGS})
 endif(NOT MSVC)
 
+# Hide warnings when building with boost >= 1.73
+add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
 
 #check for some compiler/arch specific things and export defines accordingly...
 INCLUDE (SearchForStuff)

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -559,7 +559,7 @@ if BOOST_TEST_DYN_LINK
 endif
 
 CXXLD = $(LDPREFIX) $(CXX)
-CXXFLAGS += $(BOOST_CPPFLAGS)
+CXXFLAGS += $(BOOST_CPPFLAGS) -DBOOST_BIND_GLOBAL_PLACEHOLDERS
 
 
 if STATIC

diff --git a/src/SConscript b/src/SConscript
@@ -7,7 +7,7 @@ from glob import glob
 Import("*")
 
 for env in [test_env, client_env, env]:
-    env.Append(CPPDEFINES = "$EXTRA_DEFINE")
+    env.Append(CPPDEFINES = "$EXTRA_DEFINE BOOST_BIND_GLOBAL_PLACEHOLDERS")
 
 #color_range.cpp should be removed, but game_config depends on it.
 #game_config has very few things that are needed elsewhere, it should be