Fix indentation in taskflow.hpp. Add MSVC check in CMakeLists.txt

clin99 · clin99 · commit 8020d61edbab · 2018-08-27T15:33:16.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,19 +11,25 @@ include(CTest)
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
 # Compiler vendors
-if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-  if(${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "7.2")
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "7.2")
     message(FATAL_ERROR "\nCpp-Taskflow requires g++ at least v7.2")
   endif()
-elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-  if(${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "5.0")
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0")
     message(FATAL_ERROR "\nCpp-Taskflow requires clang++ at least v5.0")
   endif()
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+  if(NOT MSVC_VERSION GREATER_EQUAL 1914)
+    message(FATAL_ERROR "\nCpp-Taskflow requires MSVC++ at least v14.14 (Visual Studio
+    2017 version 15.7)") 
+  endif()
 else()
   message(FATAL_ERROR "\n\
 Cpp-Taskflow currently supports the following compilers:\n\
 - g++ v7.2 or above\n\
 - clang++ v5.0\n\
+- MSVC++ v14.14\n\
 ")
 endif()
 
diff --git a/taskflow/taskflow.hpp b/taskflow/taskflow.hpp
@@ -982,7 +982,7 @@ auto BasicFlowBuilder<NodeType>::emplace(C&& c) {
       auto& node = _nodes.emplace_front([p = MoC(std::move(p)), c = std::forward<C>(c)]() mutable {
         c(); 
         p.get().set_value();
-			});
+      });
       return std::make_pair(TaskType(node), std::move(fu));
     }
     else {

Original file line number	Diff line number	Diff line change
`@@ -982,7 +982,7 @@ auto BasicFlowBuilder<NodeType>::emplace(C&& c) {`
`982`	`982`	`auto& node = _nodes.emplace_front([p = MoC(std::move(p)), c = std::forward<C>(c)]() mutable {`
`983`	`983`	`c();`
`984`	`984`	`p.get().set_value();`
`985`		`- });`
	`985`	`+ });`
`986`	`986`	`return std::make_pair(TaskType(node), std::move(fu));`
`987`	`987`	`}`
`988`	`988`	`else {`