From c80af26991a0b9ebdc8a56ba93a76474b5296c5f Mon Sep 17 00:00:00 2001
From: O01eg <o01eg@yandex.ru>
Date: Mon, 18 Feb 2019 08:40:54 +0300
Subject: [PATCH] Fix Boost auto-linking

---
 CMakeLists.txt              | 4 ++--
 GG/CMakeLists.txt           | 4 ++--
 GG/test/unit/CMakeLists.txt | 2 +-
 test/parse/CMakeLists.txt   | 2 +-
 test/system/CMakeLists.txt  | 4 ++--
 test/util/CMakeLists.txt    | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d468ee10a2c..e5e536f037e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -254,9 +254,9 @@ set_property(DIRECTORY APPEND
     PROPERTY COMPILE_DEFINITIONS
         # Disable Boost auto-linking
         # http://www.boost.org/doc/libs/1_59_0/libs/config/doc/html/index.html#boost_config.configuring_boost_for_your_platform.user_settable_options
-        BOOST_ALL_NO_LINK
+        BOOST_ALL_NO_LIB
 
-        # Boost iostreams doesn't honor BOOST_ALL_NO_LINK when linking zlib.
+        # Boost iostreams doesn't honor BOOST_ALL_NO_LIB when linking zlib.
         # It also tries to link by default to the boost in-source zlib librar,
         # which we don't want.
         # http://www.boost.org/doc/libs/1_59_0/boost/iostreams/detail/config/zlib.hpp
diff --git a/GG/CMakeLists.txt b/GG/CMakeLists.txt
index 78ad1c89705..e403569c74d 100644
--- a/GG/CMakeLists.txt
+++ b/GG/CMakeLists.txt
@@ -84,9 +84,9 @@ set(MINIMUM_BOOST_VERSION 1.58.0)
 
 if(NOT USE_STATIC_LIBS)
     add_definitions(
-        -DBOOST_ALL_NO_LINK
+        -DBOOST_ALL_NO_LIB
         -DBOOST_ALL_DYN_LINK
-        -DBOOST_LOG_NO_LINK
+        -DBOOST_LOG_NO_LIB
         -DBOOST_LOG_DYN_LINK
     )
 endif()
diff --git a/GG/test/unit/CMakeLists.txt b/GG/test/unit/CMakeLists.txt
index 580b44d9e22..8b107573bca 100644
--- a/GG/test/unit/CMakeLists.txt
+++ b/GG/test/unit/CMakeLists.txt
@@ -32,7 +32,7 @@ add_executable(gg_unittest
 target_compile_definitions(gg_unittest
     PRIVATE
         -DBOOST_TEST_DYN_LINK
-        -DBOOST_TEST_NO_LINK
+        -DBOOST_TEST_NO_LIB
 )
 
 target_link_libraries(gg_unittest
diff --git a/test/parse/CMakeLists.txt b/test/parse/CMakeLists.txt
index c010ae788e3..bd1cf3cba25 100644
--- a/test/parse/CMakeLists.txt
+++ b/test/parse/CMakeLists.txt
@@ -10,7 +10,7 @@ target_compile_definitions(fo_unittest_parse
     PRIVATE
         -DFREEORION_BUILD_SERVER
         -DBOOST_TEST_DYN_LINK
-        -DBOOST_TEST_NO_LINK
+        -DBOOST_TEST_NO_LIB
 )
 
 target_include_directories(fo_unittest_parse
diff --git a/test/system/CMakeLists.txt b/test/system/CMakeLists.txt
index d30ca94fa46..40477be633e 100644
--- a/test/system/CMakeLists.txt
+++ b/test/system/CMakeLists.txt
@@ -14,9 +14,9 @@ target_compile_definitions(fo_systemtest_game
     PRIVATE
         -DFREEORION_BUILD_HUMAN
         -DBOOST_TEST_DYN_LINK
-        -DBOOST_TEST_NO_LINK
+        -DBOOST_TEST_NO_LIB
         -DBOOST_LOG_DYN_LINK
-        -DBOOST_LOG_NO_LINK
+        -DBOOST_LOG_NO_LIB
         -DBOOST_TEST_IGNORE_SIGCHLD
 )
 
diff --git a/test/util/CMakeLists.txt b/test/util/CMakeLists.txt
index 3c7762259c5..4934f37e26d 100644
--- a/test/util/CMakeLists.txt
+++ b/test/util/CMakeLists.txt
@@ -7,7 +7,7 @@ add_executable(fo_unittest_util
 target_compile_definitions(fo_unittest_util
     PRIVATE
         -DBOOST_TEST_DYN_LINK
-        -DBOOST_TEST_NO_LINK
+        -DBOOST_TEST_NO_LIB
 )
 
 target_include_directories(fo_unittest_util