update cmake build

codejsha · codejsha · commit 5a11c685fcd2 · 2023-08-18T21:11:31.000+09:00
diff --git a/cpp-algorithm/CMakeLists.txt b/cpp-algorithm/CMakeLists.txt
@@ -12,5 +12,4 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-enable_testing()
 add_subdirectory(src)
diff --git a/cpp-algorithm/CMakePresets.json b/cpp-algorithm/CMakePresets.json
@@ -1,5 +1,10 @@
 {
-    "version": 3,
+    "version": 6,
+    "cmakeMinimumRequired": {
+        "major": 3,
+        "minor": 25,
+        "patch": 0
+    },
     "configurePresets": [
         {
             "name": "windows-base",
@@ -16,7 +21,7 @@
                 "lhs": "${hostSystemName}",
                 "rhs": "Windows"
             },
-            "toolchainFile": "$env{VCPKG_ROOT}\\scripts\\buildsystems\\vcpkg.cmake"
+            "toolchainFile": "$env{USERPROFILE}\\tools\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake"
         },
         {
             "name": "x64-debug",
@@ -65,10 +70,10 @@
             "binaryDir": "${sourceDir}/out/build/${presetName}",
             "installDir": "${sourceDir}/out/install/${presetName}",
             "cacheVariables": {
-              "CMAKE_C_COMPILER": "gcc-10",
-              "CMAKE_CXX_COMPILER": "g++-10",
-              "CMAKE_MAKE_PROGRAM": "/usr/bin/ninja"
-          },
+                "CMAKE_C_COMPILER": "gcc-10",
+                "CMAKE_CXX_COMPILER": "g++-10",
+                "CMAKE_MAKE_PROGRAM": "/usr/bin/ninja"
+            },
             "condition": {
                 "type": "equals",
                 "lhs": "${hostSystemName}",
diff --git a/cpp-algorithm/src/array/test/CMakeLists.txt b/cpp-algorithm/src/array/test/CMakeLists.txt
@@ -1,3 +1,4 @@
+enable_testing()
 find_package(GTest REQUIRED)
 
 if(WIN32)
diff --git a/cpp-algorithm/src/dynamic_programming/test/CMakeLists.txt b/cpp-algorithm/src/dynamic_programming/test/CMakeLists.txt
@@ -1,3 +1,4 @@
+enable_testing()
 find_package(GSL REQUIRED)
 find_package(GTest REQUIRED)
 
diff --git a/cpp-algorithm/src/graph/test/CMakeLists.txt b/cpp-algorithm/src/graph/test/CMakeLists.txt
@@ -1,3 +1,4 @@
+enable_testing()
 find_package(GTest REQUIRED)
 
 if(WIN32)
diff --git a/cpp-algorithm/src/greedy/test/CMakeLists.txt b/cpp-algorithm/src/greedy/test/CMakeLists.txt
@@ -1,3 +1,4 @@
+enable_testing()
 find_package(GTest REQUIRED)
 
 if(WIN32)
diff --git a/cpp-algorithm/src/hash_table/test/CMakeLists.txt b/cpp-algorithm/src/hash_table/test/CMakeLists.txt
@@ -1,3 +1,4 @@
+enable_testing()
 find_package(GTest REQUIRED)
 
 if(WIN32)
diff --git a/cpp-algorithm/src/heap/test/CMakeLists.txt b/cpp-algorithm/src/heap/test/CMakeLists.txt
@@ -1,3 +1,4 @@
+enable_testing()
 find_package(GTest REQUIRED)
 
 if(WIN32)
diff --git a/cpp-algorithm/src/linked_list/test/CMakeLists.txt b/cpp-algorithm/src/linked_list/test/CMakeLists.txt
@@ -1,3 +1,4 @@
+enable_testing()
 find_package(GTest REQUIRED)
 
 if(WIN32)
diff --git a/cpp-algorithm/src/math/test/CMakeLists.txt b/cpp-algorithm/src/math/test/CMakeLists.txt
@@ -1,3 +1,4 @@
+enable_testing()
 find_package(GTest REQUIRED)
 
 if(WIN32)
diff --git a/cpp-algorithm/src/primitive_type/test/CMakeLists.txt b/cpp-algorithm/src/primitive_type/test/CMakeLists.txt
@@ -1,3 +1,4 @@
+enable_testing()
 find_package(GTest REQUIRED)
 
 if(WIN32)
diff --git a/cpp-algorithm/src/queue/test/CMakeLists.txt b/cpp-algorithm/src/queue/test/CMakeLists.txt
@@ -1,3 +1,4 @@
+enable_testing()
 find_package(GTest REQUIRED)
 
 if(WIN32)
diff --git a/cpp-algorithm/src/search/test/CMakeLists.txt b/cpp-algorithm/src/search/test/CMakeLists.txt
@@ -1,3 +1,4 @@
+enable_testing()
 find_package(GTest REQUIRED)
 
 if(WIN32)
diff --git a/cpp-algorithm/src/sort/test/CMakeLists.txt b/cpp-algorithm/src/sort/test/CMakeLists.txt
@@ -1,3 +1,4 @@
+enable_testing()
 find_package(GTest REQUIRED)
 
 if(WIN32)
diff --git a/cpp-algorithm/src/stack/test/CMakeLists.txt b/cpp-algorithm/src/stack/test/CMakeLists.txt
@@ -1,3 +1,4 @@
+enable_testing()
 find_package(GTest REQUIRED)
 
 if(WIN32)
diff --git a/cpp-algorithm/src/string/test/CMakeLists.txt b/cpp-algorithm/src/string/test/CMakeLists.txt
@@ -1,3 +1,4 @@
+enable_testing()
 find_package(fmt REQUIRED)
 find_package(GTest REQUIRED)
 
diff --git a/cpp-algorithm/src/tree/test/CMakeLists.txt b/cpp-algorithm/src/tree/test/CMakeLists.txt
@@ -1,3 +1,4 @@
+enable_testing()
 find_package(GTest REQUIRED)
 
 if(WIN32)

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+enable_testing()`
`1`	`2`	`find_package(GTest REQUIRED)`
`2`	`3`
`3`	`4`	`if(WIN32)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+enable_testing()`
`1`	`2`	`find_package(GSL REQUIRED)`
`2`	`3`	`find_package(GTest REQUIRED)`
`3`	`4`