Adapt MSVC C++ mode handling to VS15.5

STEllAR-GROUP · Dec 12, 2017 · 14237dd · 14237dd
1 parent 82f7b28
commit 14237dd
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/cmake/HPX_DetectCppDialect.cmake b/cmake/HPX_DetectCppDialect.cmake
@@ -89,24 +89,23 @@ macro(hpx_detect_cpp_dialect)
 
     # enable enforcing a particular C++ mode
     if(HPX_WITH_CXX17)
-      set(CXX_FLAG -std:c++latest)
-      hpx_add_config_cond_define(_HAS_AUTO_PTR_ETC 1)
+      set(CXX_FLAG -std:c++17)
       hpx_info("C++ mode enforced: C++17")
-    elseif(HPX_WITH_CXX1Z)
-      set(CXX_FLAG -std:c++latest)
-      hpx_add_config_cond_define(_HAS_AUTO_PTR_ETC 1)
       hpx_add_config_cond_define(BOOST_NO_AUTO_PTR)
+      hpx_add_config_cond_define(_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS)
+    elseif(HPX_WITH_CXX1Z)
+      set(CXX_FLAG -std:c++17)
       hpx_info("C++ mode enforced: C++1z")
+      hpx_add_config_cond_define(BOOST_NO_AUTO_PTR)
+      hpx_add_config_cond_define(_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS)
     elseif(HPX_WITH_CXX14)
       set(CXX_FLAG -std:c++14)
-      hpx_add_config_cond_define(_HAS_AUTO_PTR_ETC 1)
       if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
         hpx_add_config_cond_define(BOOST_NO_CXX14_CONSTEXPR)
       endif()
       hpx_info("C++ mode enforced: C++14")
     elseif(HPX_WITH_CXX1Y)
       set(CXX_FLAG -std:c++14)
-      hpx_add_config_cond_define(_HAS_AUTO_PTR_ETC 1)
       hpx_info("C++ mode enforced: C++1y")
     elseif(HPX_WITH_CXX11)
       hpx_info("C++ mode enforced: C++11")
@@ -116,6 +115,8 @@ macro(hpx_detect_cpp_dialect)
       hpx_info("C++ mode assumed: C++11")
     endif()
 
+    hpx_add_config_cond_define(_HAS_AUTO_PTR_ETC 1)
+
   else(MSVC)
 
     # enable enforcing a particular C++ mode