code beautify

AlgorithmsDafeMipt2024 · Oct 27, 2024 · f01684b · f01684b
1 parent 729a22e
commit f01684b
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,11 +1,13 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.20)
 
-project(homeworks)
+project(homeworks LANGUAGES CXX)
 
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lib)
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -std=c++20 -O2")
 
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lib)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sandbox)
-
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/additional_tasks)
 
 file(GLOB_RECURSE tasks_dirs LIST_DIRECTORIES true ".")

diff --git a/additional_tasks/strongly_connected_components/CMakeLists.txt b/additional_tasks/strongly_connected_components/CMakeLists.txt
@@ -23,7 +23,6 @@ add_executable(${PROJECT_NAME} ${source_list} ${lib_source_list})
 # Locate GTest
 enable_testing()
 find_package(GTest REQUIRED)
-
 include_directories(${GTEST_INCLUDE_DIRS})
 
 find_library(Utils ../)

diff --git a/additional_tasks/template_task/CMakeLists.txt b/additional_tasks/template_task/CMakeLists.txt
@@ -23,7 +23,6 @@ add_executable(${PROJECT_NAME} ${source_list} ${lib_source_list})
 # Locate GTest
 enable_testing()
 find_package(GTest REQUIRED)
-
 include_directories(${GTEST_INCLUDE_DIRS})
 
 find_library(Utils ../)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -7,4 +7,5 @@ file(GLOB_RECURSE lib_source_list "src/*.cpp" "src/*.hpp")
 
 add_library(${PROJECT_NAME} ${lib_source_list})
 
+set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
diff --git a/lib/src/graph/for_string/graph_methods.cpp b/lib/src/graph/for_string/graph_methods.cpp
@@ -22,7 +22,7 @@ void Graph<vert_t, weight_t>::RemoveVert(vert_t vert) {
 template <AllowedVertType vert_t, AllowedWeightType weight_t>
 std::pair<vert_t, vert_t> Graph<vert_t, weight_t>::ParseEdgeString(
     const std::string& edge_str) {
-  size_t pos = edge_str.find("->");
+  const size_t pos = edge_str.find("->");
 
   if (pos == std::string::npos)
     throw std::invalid_argument("EdgeString: invalid edge string format: " +

diff --git a/sandbox/template/CMakeLists.txt b/sandbox/template/CMakeLists.txt
@@ -22,7 +22,6 @@ add_executable(${PROJECT_NAME} ${source_list})
 # Locate GTest
 enable_testing()
 find_package(GTest REQUIRED)
-
 include_directories(${GTEST_INCLUDE_DIRS})
 
 find_library(Utils ../)

diff --git a/task_01/CMakeLists.txt b/task_01/CMakeLists.txt
@@ -22,7 +22,6 @@ add_executable(${PROJECT_NAME} ${source_list})
 # Locate GTest
 enable_testing()
 find_package(GTest REQUIRED)
-
 include_directories(${GTEST_INCLUDE_DIRS})
 
 find_library(Utils ../)

diff --git a/task_02/CMakeLists.txt b/task_02/CMakeLists.txt
@@ -22,7 +22,6 @@ add_executable(${PROJECT_NAME} ${source_list})
 # Locate GTest
 enable_testing()
 find_package(GTest REQUIRED)
-
 include_directories(${GTEST_INCLUDE_DIRS})
 
 find_library(Utils ../)

diff --git a/task_03/CMakeLists.txt b/task_03/CMakeLists.txt
@@ -22,7 +22,6 @@ add_executable(${PROJECT_NAME} ${source_list})
 # Locate GTest
 enable_testing()
 find_package(GTest REQUIRED)
-
 include_directories(${GTEST_INCLUDE_DIRS})
 
 find_library(Utils ../)

diff --git a/task_04/CMakeLists.txt b/task_04/CMakeLists.txt
@@ -22,7 +22,6 @@ add_executable(${PROJECT_NAME} ${source_list})
 # Locate GTest
 enable_testing()
 find_package(GTest REQUIRED)
-
 include_directories(${GTEST_INCLUDE_DIRS})
 
 find_library(Utils ../)

diff --git a/task_05/CMakeLists.txt b/task_05/CMakeLists.txt
@@ -22,7 +22,6 @@ add_executable(${PROJECT_NAME} ${source_list})
 # Locate GTest
 enable_testing()
 find_package(GTest REQUIRED)
-
 include_directories(${GTEST_INCLUDE_DIRS})
 
 find_library(Utils ../)

diff --git a/task_06/CMakeLists.txt b/task_06/CMakeLists.txt
@@ -22,7 +22,6 @@ add_executable(${PROJECT_NAME} ${source_list})
 # Locate GTest
 enable_testing()
 find_package(GTest REQUIRED)
-
 include_directories(${GTEST_INCLUDE_DIRS})
 
 find_library(Utils ../)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,5 @@ file(GLOB_RECURSE lib_source_list "src/.cpp" "src/.hpp")

		add_library(${PROJECT_NAME} ${lib_source_list})

		set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
		target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)