Merge branch 'master' of https://github.com/learning-process/parallel_programming_course

# Conflicts:
#	cmake/gtest.cmake
#	cmake/json.cmake
#	cmake/libenvpp.cmake
#	cmake/mpi.cmake
#	cmake/onetbb.cmake
#	cmake/openmp.cmake
#	cmake/stb.cmake

Author: allnes

cmake/gtest.cmake

@@ -26,13 +26,13 @@ ExternalProject_Add(
     "${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/install")
 
 function(ppc_link_gtest exec_func_lib)
-    # Add external project include directories
-    target_include_directories(
-            ${exec_func_lib}
-            PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty/googletest/googletest/include)
+  # Add external project include directories
+  target_include_directories(
+    ${exec_func_lib}
+    PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty/googletest/googletest/include)
 
-    add_dependencies(${exec_func_lib} ppc_googletest)
-    target_link_directories(${exec_func_lib} PUBLIC
-            "${CMAKE_BINARY_DIR}/ppc_googletest/install/lib")
-    target_link_libraries(${exec_func_lib} PUBLIC gtest gtest_main)
+  add_dependencies(${exec_func_lib} ppc_googletest)
+  target_link_directories(${exec_func_lib} PUBLIC
+                          "${CMAKE_BINARY_DIR}/ppc_googletest/install/lib")
+  target_link_libraries(${exec_func_lib} PUBLIC gtest gtest_main)
 endfunction()

cmake/json.cmake

@@ -21,12 +21,11 @@ ExternalProject_Add(
     --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/install")
 
 function(ppc_link_json exec_func_lib)
-    # Add external project include directories
-    target_include_directories(
-            ${exec_func_lib}
-            PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty/json/include)
+  # Add external project include directories
+  target_include_directories(${exec_func_lib}
+                             PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty/json/include)
 
-    add_dependencies(${exec_func_lib} ppc_json)
-    target_link_directories(${exec_func_lib} INTERFACE
-            "${CMAKE_BINARY_DIR}/ppc_json/install/include")
-endfunction()
+  add_dependencies(${exec_func_lib} ppc_json)
+  target_link_directories(${exec_func_lib} INTERFACE
+                          "${CMAKE_BINARY_DIR}/ppc_json/install/include")
+endfunction()

cmake/libenvpp.cmake

@@ -42,17 +42,16 @@ endif()
 function(ppc_link_envpp exec_func_lib)
   # Add external project include directories
   target_include_directories(
-          ${exec_func_lib}
-          PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty/libenvpp/include)
+    ${exec_func_lib} PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty/libenvpp/include)
   target_include_directories(
-          ${exec_func_lib} SYSTEM
-          PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty/libenvpp/external/fmt/include)
+    ${exec_func_lib} SYSTEM
+    PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty/libenvpp/external/fmt/include)
 
   add_dependencies(${exec_func_lib} ppc_libenvpp)
   target_link_directories(${exec_func_lib} PUBLIC
-          "${CMAKE_BINARY_DIR}/ppc_libenvpp/install/lib")
+                          "${CMAKE_BINARY_DIR}/ppc_libenvpp/install/lib")
   target_link_directories(${exec_func_lib} PUBLIC
-          "${CMAKE_BINARY_DIR}/ppc_libenvpp/build")
+                          "${CMAKE_BINARY_DIR}/ppc_libenvpp/build")
   target_link_libraries(${exec_func_lib} PUBLIC ${PPC_ENVPP_LIB_NAME})
   target_link_libraries(${exec_func_lib} PUBLIC ${PPC_FMT_LIB_NAME})
 endfunction()

cmake/mpi.cmake

@@ -7,12 +7,12 @@ function(ppc_link_mpi exec_func_lib)
   find_package(MPI REQUIRED)
   if(MPI_COMPILE_FLAGS)
     set_target_properties(${exec_func_lib} PROPERTIES COMPILE_FLAGS
-            "${MPI_COMPILE_FLAGS}")
+                                                      "${MPI_COMPILE_FLAGS}")
   endif(MPI_COMPILE_FLAGS)
 
   if(MPI_LINK_FLAGS)
     set_target_properties(${exec_func_lib} PROPERTIES LINK_FLAGS
-            "${MPI_LINK_FLAGS}")
+                                                      "${MPI_LINK_FLAGS}")
   endif(MPI_LINK_FLAGS)
   target_include_directories(${exec_func_lib} PUBLIC ${MPI_INCLUDE_PATH})
   target_link_libraries(${exec_func_lib} PUBLIC ${MPI_LIBRARIES})

cmake/onetbb.cmake

@@ -45,13 +45,12 @@ endif()
 
 function(ppc_link_tbb exec_func_lib)
   # Add external project include directories
-  target_include_directories(
-          ${exec_func_lib}
-          PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty/onetbb/include)
+  target_include_directories(${exec_func_lib}
+                             PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty/onetbb/include)
 
   add_dependencies(${exec_func_lib} ppc_onetbb)
   target_link_directories(${exec_func_lib} PUBLIC
-          ${CMAKE_BINARY_DIR}/ppc_onetbb/install/lib)
+                          ${CMAKE_BINARY_DIR}/ppc_onetbb/install/lib)
   if(NOT MSVC)
     target_link_libraries(${exec_func_lib} PUBLIC ${PPC_TBB_LIB_NAME})
   endif()

cmake/openmp.cmake

@@ -31,5 +31,5 @@ endfunction()
 function(ppc_link_openmp exec_func_lib)
   find_package(OpenMP REQUIRED)
   target_link_libraries(${exec_func_lib} PUBLIC ${OpenMP_libomp_LIBRARY}
-          OpenMP::OpenMP_CXX)
+                                                OpenMP::OpenMP_CXX)
 endfunction()

cmake/stb.cmake

@@ -1,5 +1,6 @@
 function(ppc_link_stb exec_func_lib)
-    add_library(stb_image STATIC ${CMAKE_SOURCE_DIR}/3rdparty/stb_image_wrapper.cpp)
-    target_include_directories(stb_image PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty/stb)
-    target_link_libraries(${exec_func_lib} PUBLIC stb_image)
-endfunction()
+  add_library(stb_image STATIC
+              ${CMAKE_SOURCE_DIR}/3rdparty/stb_image_wrapper.cpp)
+  target_include_directories(stb_image PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty/stb)
+  target_link_libraries(${exec_func_lib} PUBLIC stb_image)
+endfunction()