Build: Support boost versions compiled in C++11 as well as C++03 mode

Issues related to boost::filesystem and scoped enums

2 files changed, 34 insertions, 1 deletions

diff --git a/cmake/macros/ConfigureBoost.cmake b/cmake/macros/ConfigureBoost.cmake
index 81b4dd9abb2..6b2419a00e7 100644
--- a/cmake/macros/ConfigureBoost.cmake
+++ b/cmake/macros/ConfigureBoost.cmake
@@ -30,7 +30,15 @@ add_definitions(-DBOOST_DATE_TIME_NO_LIB)
 add_definitions(-DBOOST_REGEX_NO_LIB)

 add_definitions(-DBOOST_CHRONO_NO_LIB)

 

-if(!WIN32) # https://svn.boost.org/trac/boost/ticket/6779

+try_compile (boost_filesystem_copy_links_without_NO_SCOPED_ENUM

+  ${CMAKE_BINARY_DIR}/try_compile/boost_filesystem_copy_links_without_NO_SCOPED_ENUM

+  SOURCES ${CMAKE_SOURCE_DIR}/cmake/test_use_boost_cxx11_no_scoped_enum_for_filesystem.cpp

+  COMPILE_DEFINITIONS -I${Boost_INCLUDE_DIR}

+                      --std=c++11

+  LINK_LIBRARIES ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}

+)

+

+if (NOT boost_filesystem_copy_links_without_NO_SCOPED_ENUM)

   add_definitions(-DBOOST_NO_CXX11_SCOPED_ENUMS)

 endif()

 

diff --git a/cmake/test_use_boost_cxx11_no_scoped_enum_for_filesystem.cpp b/cmake/test_use_boost_cxx11_no_scoped_enum_for_filesystem.cpp
new file mode 100644
index 00000000000..d5df4c6c83f
--- /dev/null
+++ b/cmake/test_use_boost_cxx11_no_scoped_enum_for_filesystem.cpp
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+
+int main()
+{
+    boost::filesystem::copy_file(boost::filesystem::path(), boost::filesystem::path());
+    return 0;
+}