Define BOOST_NO_CXX11_SCOPED_ENUMS in CMake config

CMakeLists.txt

@@ -318,9 +318,11 @@ include_directories ("${CMAKE_SOURCE_DIR}/src"
 # System-Specific Settings
 ##############################
 
-# If building on Travis, set a preprocessor definition.
+# If building on Travis, define BOOST_NO_CXX11_SCOPED_ENUMS to avoid 
+# boost::filesystem::copy_file() linking errors due to mismatched C++ runtimes
+# between Boost and LOOT.
 IF ($ENV{TRAVIS})
-    add_definitions (-DTRAVIS)
+    add_definitions (-DBOOST_NO_CXX11_SCOPED_ENUMS)
 ENDIF ()
 
 # Settings when compiling for Windows.

src/tests/api/main.cpp

@@ -22,11 +22,6 @@
     <http://www.gnu.org/licenses/>.
     */
 
-#ifdef TRAVIS
-#pragma message("This is a Travis build, so defining BOOST_NO_CXX11_SCOPED_ENUMS to avoid boost::filesystem::copy_file() linking errors.")
-#define BOOST_NO_CXX11_SCOPED_ENUMS
-#endif
-
 #include <gtest/gtest.h>
 
 #include "loot_apply_load_order_test.h"

src/tests/backend/main.cpp

@@ -22,11 +22,6 @@
     <http://www.gnu.org/licenses/>.
     */
 
-#ifdef TRAVIS
-#pragma message("This is a Travis build, so defining BOOST_NO_CXX11_SCOPED_ENUMS to avoid boost::filesystem::copy_file() linking errors.")
-#define BOOST_NO_CXX11_SCOPED_ENUMS
-#endif
-
 #include "tests/api/loot_db_test.h"
 
 #include "app/loot_paths_test.h"

src/validator/main.cpp

@@ -22,11 +22,6 @@
     <http://www.gnu.org/licenses/>.
     */
 
-#ifdef TRAVIS
-#pragma message("This is a Travis build, so defining BOOST_NO_CXX11_SCOPED_ENUMS to avoid boost::filesystem::copy_file() linking errors.")
-#define BOOST_NO_CXX11_SCOPED_ENUMS
-#endif
-
 #include "backend/app/loot_version.h"
 #include "backend/metadata_list.h"