Skip to content

added lab 5 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

added lab 5 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Lab4/.idea/.name
View file
Open in desktop

This file was deleted.

Binary file removed Lab4/assets/Diagram.jpg
View file
Open in desktop
Binary file not shown.
Binary file removed Lab4/cmake-build-debug/.ninja_deps
View file
Open in desktop
Binary file not shown.
3 changes: 0 additions & 3 deletions Lab4/cmake-build-debug/.ninja_log
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions Lab4/cmake-build-debug/CMakeFiles/TargetDirectories.txt
View file
Open in desktop

This file was deleted.

Binary file removed Lab4/cmake-build-debug/Lab5
View file
Open in desktop
Binary file not shown.
3 changes: 0 additions & 3 deletions Lab4/cmake-build-debug/Testing/Temporary/LastTest.log
View file
Open in desktop

This file was deleted.

168 changes: 0 additions & 168 deletions Lab4/main.cpp
View file
Open in desktop

This file was deleted.

0 Lab4/.idea/.gitignore → Lab5/.idea/.gitignore
View file
Open in desktop
File renamed without changes.
0 Lab4/.idea/Lab5.iml → Lab5/.idea/Lab5.iml
View file
Open in desktop
File renamed without changes.
0 Lab4/.idea/misc.xml → Lab5/.idea/misc.xml
View file
Open in desktop
File renamed without changes.
0 Lab4/.idea/modules.xml → Lab5/.idea/modules.xml
View file
Open in desktop
File renamed without changes.
0 Lab4/CMakeLists.txt → Lab5/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
0 ...-build-debug/.cmake/api/v1/query/cache-v2 → ...-build-debug/.cmake/api/v1/query/cache-v2
View file
Open in desktop
File renamed without changes.
0 ...d-debug/.cmake/api/v1/query/cmakeFiles-v1 → ...d-debug/.cmake/api/v1/query/cmakeFiles-v1
View file
Open in desktop
File renamed without changes.
0 ...ld-debug/.cmake/api/v1/query/codemodel-v2 → ...ld-debug/.cmake/api/v1/query/codemodel-v2
View file
Open in desktop
File renamed without changes.
0 ...d-debug/.cmake/api/v1/query/toolchains-v1 → ...d-debug/.cmake/api/v1/query/toolchains-v1
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions .../reply/cache-v2-1767fdd8104e2244da49.json → .../reply/cache-v2-1c5091d8f8b706d38a6d.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
}
],
"type" : "INTERNAL",
"value" : "/home/oleg/CLionProjects/Lab4/cmake-build-debug"
"value" : "/home/oleg/CLionProjects/Lab5/cmake-build-debug"
},
{
"name" : "CMAKE_CACHE_MAJOR_VERSION",
Expand Down Expand Up @@ -591,7 +591,7 @@
}
],
"type" : "INTERNAL",
"value" : "/home/oleg/CLionProjects/Lab4"
"value" : "/home/oleg/CLionProjects/Lab5"
},
{
"name" : "CMAKE_INSTALL_PREFIX",
Expand Down Expand Up @@ -1123,7 +1123,7 @@
}
],
"type" : "STATIC",
"value" : "/home/oleg/CLionProjects/Lab4/cmake-build-debug"
"value" : "/home/oleg/CLionProjects/Lab5/cmake-build-debug"
},
{
"name" : "Lab5_IS_TOP_LEVEL",
Expand All @@ -1147,7 +1147,7 @@
}
],
"type" : "STATIC",
"value" : "/home/oleg/CLionProjects/Lab4"
"value" : "/home/oleg/CLionProjects/Lab5"
}
],
"kind" : "cache",
Expand Down
4 changes: 2 additions & 2 deletions ...y/cmakeFiles-v1-3782f3ef82737f85a2ae.json → ...y/cmakeFiles-v1-d2b617dd00efc338ac82.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,8 +728,8 @@
"kind" : "cmakeFiles",
"paths" :
{
"build" : "/home/oleg/CLionProjects/Lab4/cmake-build-debug",
"source" : "/home/oleg/CLionProjects/Lab4"
"build" : "/home/oleg/CLionProjects/Lab5/cmake-build-debug",
"source" : "/home/oleg/CLionProjects/Lab5"
},
"version" :
{
Expand Down
4 changes: 2 additions & 2 deletions ...ly/codemodel-v2-6d628205450bc11267c7.json → ...ly/codemodel-v2-c18c218fdd213fb6c379.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
"kind" : "codemodel",
"paths" :
{
"build" : "/home/oleg/CLionProjects/Lab4/cmake-build-debug",
"source" : "/home/oleg/CLionProjects/Lab4"
"build" : "/home/oleg/CLionProjects/Lab5/cmake-build-debug",
"source" : "/home/oleg/CLionProjects/Lab5"
},
"version" :
{
Expand Down
0 ...rectory-.-Debug-f5ebdc15457944623624.json → ...rectory-.-Debug-f5ebdc15457944623624.json
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions ...reply/index-2022-11-08T12-22-39-0760.json → ...reply/index-2022-11-19T15-48-54-0345.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"objects" :
[
{
"jsonFile" : "codemodel-v2-6d628205450bc11267c7.json",
"jsonFile" : "codemodel-v2-c18c218fdd213fb6c379.json",
"kind" : "codemodel",
"version" :
{
Expand All @@ -35,7 +35,7 @@
}
},
{
"jsonFile" : "cache-v2-1767fdd8104e2244da49.json",
"jsonFile" : "cache-v2-1c5091d8f8b706d38a6d.json",
"kind" : "cache",
"version" :
{
Expand All @@ -44,7 +44,7 @@
}
},
{
"jsonFile" : "cmakeFiles-v1-3782f3ef82737f85a2ae.json",
"jsonFile" : "cmakeFiles-v1-d2b617dd00efc338ac82.json",
"kind" : "cmakeFiles",
"version" :
{
Expand All @@ -66,7 +66,7 @@
{
"cache-v2" :
{
"jsonFile" : "cache-v2-1767fdd8104e2244da49.json",
"jsonFile" : "cache-v2-1c5091d8f8b706d38a6d.json",
"kind" : "cache",
"version" :
{
Expand All @@ -76,7 +76,7 @@
},
"cmakeFiles-v1" :
{
"jsonFile" : "cmakeFiles-v1-3782f3ef82737f85a2ae.json",
"jsonFile" : "cmakeFiles-v1-d2b617dd00efc338ac82.json",
"kind" : "cmakeFiles",
"version" :
{
Expand All @@ -86,7 +86,7 @@
},
"codemodel-v2" :
{
"jsonFile" : "codemodel-v2-6d628205450bc11267c7.json",
"jsonFile" : "codemodel-v2-c18c218fdd213fb6c379.json",
"kind" : "codemodel",
"version" :
{
Expand Down
0 ...rget-Lab5-Debug-52f21121ec96c30cc25a.json → ...rget-Lab5-Debug-52f21121ec96c30cc25a.json
View file
Open in desktop
File renamed without changes.
0 ...y/toolchains-v1-ffb6434f9d66dd28afdb.json → ...y/toolchains-v1-ffb6434f9d66dd28afdb.json
View file
Open in desktop
File renamed without changes.
Binary file added Lab5/cmake-build-debug/.ninja_deps
View file
Open in desktop
Binary file not shown.
11 changes: 11 additions & 0 deletions Lab5/cmake-build-debug/.ninja_log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# ninja log v5
283 336 1668889468364594376 Lab5 f017a636266399f6
0 283 1668889468312595144 CMakeFiles/Lab5.dir/main.cpp.o 99e467c3bbf18d6b
0 272 1668889510219973363 CMakeFiles/Lab5.dir/main.cpp.o 99e467c3bbf18d6b
272 316 1668889510259972769 Lab5 f017a636266399f6
0 234 1668890011032303146 CMakeFiles/Lab5.dir/main.cpp.o 99e467c3bbf18d6b
234 279 1668890011076302458 Lab5 f017a636266399f6
1 239 1668890021252143410 CMakeFiles/Lab5.dir/main.cpp.o 99e467c3bbf18d6b
239 284 1668890021296142722 Lab5 f017a636266399f6
0 279 1669063121626165701 CMakeFiles/Lab5.dir/main.cpp.o 99e467c3bbf18d6b
279 321 1669063121670165991 Lab5 f017a636266399f6
10 changes: 5 additions & 5 deletions Lab4/cmake-build-debug/CMakeCache.txt → Lab5/cmake-build-debug/CMakeCache.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This is the CMakeCache file.
# For build in directory: /home/oleg/CLionProjects/Lab4/cmake-build-debug
# For build in directory: /home/oleg/CLionProjects/Lab5/cmake-build-debug
# It was generated by CMake: /snap/clion/209/bin/cmake/linux/bin/cmake
# You can edit this file to change values found and used by cmake.
# If you do not want to change any of the values, simply exit the editor.
Expand Down Expand Up @@ -207,13 +207,13 @@ CMAKE_STRIP:FILEPATH=/usr/bin/strip
CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE

//Value Computed by CMake
Lab5_BINARY_DIR:STATIC=/home/oleg/CLionProjects/Lab4/cmake-build-debug
Lab5_BINARY_DIR:STATIC=/home/oleg/CLionProjects/Lab5/cmake-build-debug

//Value Computed by CMake
Lab5_IS_TOP_LEVEL:STATIC=ON

//Value Computed by CMake
Lab5_SOURCE_DIR:STATIC=/home/oleg/CLionProjects/Lab4
Lab5_SOURCE_DIR:STATIC=/home/oleg/CLionProjects/Lab5


########################
Expand All @@ -225,7 +225,7 @@ CMAKE_ADDR2LINE-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_AR
CMAKE_AR-ADVANCED:INTERNAL=1
//This is the directory where this CMakeCache.txt was created
CMAKE_CACHEFILE_DIR:INTERNAL=/home/oleg/CLionProjects/Lab4/cmake-build-debug
CMAKE_CACHEFILE_DIR:INTERNAL=/home/oleg/CLionProjects/Lab5/cmake-build-debug
//Major version of cmake used to create the current loaded cache
CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
//Minor version of cmake used to create the current loaded cache
Expand Down Expand Up @@ -300,7 +300,7 @@ CMAKE_GENERATOR_PLATFORM:INTERNAL=
CMAKE_GENERATOR_TOOLSET:INTERNAL=
//Source directory with the top level CMakeLists.txt file for this
// project
CMAKE_HOME_DIRECTORY:INTERNAL=/home/oleg/CLionProjects/Lab4
CMAKE_HOME_DIRECTORY:INTERNAL=/home/oleg/CLionProjects/Lab5
//Install .so files without execute permission.
CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1
//ADVANCED property for variable: CMAKE_LINKER
Expand Down
0 ...ug/CMakeFiles/3.23.2/CMakeCCompiler.cmake → ...ug/CMakeFiles/3.23.2/CMakeCCompiler.cmake
View file
Open in desktop
File renamed without changes.
0 .../CMakeFiles/3.23.2/CMakeCXXCompiler.cmake → .../CMakeFiles/3.23.2/CMakeCXXCompiler.cmake
View file
Open in desktop
File renamed without changes.
0 ...es/3.23.2/CMakeDetermineCompilerABI_C.bin → ...es/3.23.2/CMakeDetermineCompilerABI_C.bin
View file
Open in desktop
File renamed without changes.
0 .../3.23.2/CMakeDetermineCompilerABI_CXX.bin → .../3.23.2/CMakeDetermineCompilerABI_CXX.bin
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...debug/CMakeFiles/3.23.2/CMakeSystem.cmake → ...debug/CMakeFiles/3.23.2/CMakeSystem.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
set(CMAKE_HOST_SYSTEM "Linux-5.15.0-52-generic")
set(CMAKE_HOST_SYSTEM "Linux-5.15.0-53-generic")
set(CMAKE_HOST_SYSTEM_NAME "Linux")
set(CMAKE_HOST_SYSTEM_VERSION "5.15.0-52-generic")
set(CMAKE_HOST_SYSTEM_VERSION "5.15.0-53-generic")
set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64")



set(CMAKE_SYSTEM "Linux-5.15.0-52-generic")
set(CMAKE_SYSTEM "Linux-5.15.0-53-generic")
set(CMAKE_SYSTEM_NAME "Linux")
set(CMAKE_SYSTEM_VERSION "5.15.0-52-generic")
set(CMAKE_SYSTEM_VERSION "5.15.0-53-generic")
set(CMAKE_SYSTEM_PROCESSOR "x86_64")

set(CMAKE_CROSSCOMPILING "FALSE")
Expand Down
0 ...les/3.23.2/CompilerIdC/CMakeCCompilerId.c → ...les/3.23.2/CompilerIdC/CMakeCCompilerId.c
View file
Open in desktop
File renamed without changes.
0 ...23.2/CompilerIdCXX/CMakeCXXCompilerId.cpp → ...23.2/CompilerIdCXX/CMakeCXXCompilerId.cpp
View file
Open in desktop
File renamed without changes.
Loading