Skip to content

Commit

Permalink
completed exercise two
Browse files Browse the repository at this point in the history
  • Loading branch information
@yusufjimoh
yusufjimoh committed May 29, 2024
1 parent cc142d7 commit db905dd
Show file tree
Hide file tree
Showing 25 changed files with 316 additions and 158 deletions.
13 changes: 9 additions & 4 deletions exercises-cpp/jimoh_yusuf/ex01_basics/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,27 @@ cmake_minimum_required ( VERSION 2.8.5 )
project ( WordCounter )

# Find custom cmake modules
set ( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../CMake")
set ( CMAKE_MODULE_PATH "../../../CMake")

# Common setup
include ( CommonSetup )


###############################################################################
# Executable
###############################################################################

set ( SRC_FILES
src/main.cpp
src/main.cpp
# add any additional source files here
)

set ( HDR_FILES
../ex02_oo_basics/src/Rectangle.cpp
../ex02_oo_basics/src/Rectangle.h
../ex02_oo_basics/src/Circle.cpp
../ex02_oo_basics/src/Circle.h

# add any additional header files here
)

add_executable ( WordCounter ${SRC_FILES} ${HDR_FILES} )
add_executable ( WordCounter ${SRC_FILES} ${HDR_FILES})
4 changes: 0 additions & 4 deletions ...y/cmakeFiles-v1-433e391d75207a7ab675.json → ...y/cmakeFiles-v1-62d1a7d1ad487487bb18.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,6 @@
"isCMake" : true,
"isExternal" : true,
"path" : "C:/Program Files/JetBrains/CLion 2024.1.1/bin/cmake/win/x64/share/cmake-3.28/Modules/CMakeCommonLanguageInclude.cmake"
},
{
"isExternal" : true,
"path" : "C:/Users/gfl56326/Documents/newstarter/CMake/CommonSetup.cmake"
}
],
"kind" : "cmakeFiles",
Expand Down
2 changes: 1 addition & 1 deletion ...ly/codemodel-v2-f34bfee0fe0b58026b8f.json → ...ly/codemodel-v2-96976ee99bf3927d8850.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
{
"directoryIndex" : 0,
"id" : "WordCounter::@6890427a1f51a3e7e1df",
"jsonFile" : "target-WordCounter-Debug-034c12d909577b73f735.json",
"jsonFile" : "target-WordCounter-Debug-38d7e9c602ffcde1e43c.json",
"name" : "WordCounter",
"projectIndex" : 0
}
Expand Down
8 changes: 4 additions & 4 deletions ...reply/index-2024-05-29T12-28-03-0350.json → ...reply/index-2024-05-29T14-15-11-0280.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"objects" :
[
{
"jsonFile" : "codemodel-v2-f34bfee0fe0b58026b8f.json",
"jsonFile" : "codemodel-v2-96976ee99bf3927d8850.json",
"kind" : "codemodel",
"version" :
{
Expand All @@ -44,7 +44,7 @@
}
},
{
"jsonFile" : "cmakeFiles-v1-433e391d75207a7ab675.json",
"jsonFile" : "cmakeFiles-v1-62d1a7d1ad487487bb18.json",
"kind" : "cmakeFiles",
"version" :
{
Expand Down Expand Up @@ -76,7 +76,7 @@
},
"cmakeFiles-v1" :
{
"jsonFile" : "cmakeFiles-v1-433e391d75207a7ab675.json",
"jsonFile" : "cmakeFiles-v1-62d1a7d1ad487487bb18.json",
"kind" : "cmakeFiles",
"version" :
{
Expand All @@ -86,7 +86,7 @@
},
"codemodel-v2" :
{
"jsonFile" : "codemodel-v2-f34bfee0fe0b58026b8f.json",
"jsonFile" : "codemodel-v2-96976ee99bf3927d8850.json",
"kind" : "codemodel",
"version" :
{
Expand Down
107 changes: 42 additions & 65 deletions ...rdCounter-Debug-034c12d909577b73f735.json → ...rdCounter-Debug-38d7e9c602ffcde1e43c.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,22 @@
"artifacts" :
[
{
"path" : "bin/WordCounter.exe"
"path" : "WordCounter.exe"
},
{
"path" : "bin/WordCounter.pdb"
"path" : "WordCounter.pdb"
}
],
"backtrace" : 1,
"backtraceGraph" :
{
"commands" :
[
"add_executable",
"add_compile_options",
"include",
"add_definitions"
"add_executable"
],
"files" :
[
"CMakeLists.txt",
"C:/Users/gfl56326/Documents/newstarter/CMake/CommonSetup.cmake"
"CMakeLists.txt"
],
"nodes" :
[
Expand All @@ -31,30 +27,8 @@
{
"command" : 0,
"file" : 0,
"line" : 28,
"line" : 33,
"parent" : 0
},
{
"command" : 2,
"file" : 0,
"line" : 13,
"parent" : 0
},
{
"file" : 1,
"parent" : 2
},
{
"command" : 1,
"file" : 1,
"line" : 23,
"parent" : 3
},
{
"command" : 3,
"file" : 1,
"line" : 27,
"parent" : 3
}
]
},
Expand All @@ -64,44 +38,15 @@
"compileCommandFragments" :
[
{
"fragment" : "-g -std=c++17 -fdiagnostics-color=always"
},
{
"backtrace" : 4,
"fragment" : "-Wall"
},
{
"backtrace" : 4,
"fragment" : "-Wextra"
},
{
"backtrace" : 4,
"fragment" : "-pedantic"
},
{
"backtrace" : 4,
"fragment" : "-Werror"
}
],
"defines" :
[
{
"backtrace" : 5,
"define" : "_USE_MATH_DEFINES"
"fragment" : "-g -fdiagnostics-color=always"
}
],
"language" : "CXX",
"languageStandard" :
{
"backtraces" :
[
1
],
"standard" : "17"
},
"sourceIndexes" :
[
0
0,
1,
3
]
}
],
Expand Down Expand Up @@ -138,7 +83,17 @@
"name" : "Source Files",
"sourceIndexes" :
[
0
0,
1,
3
]
},
{
"name" : "Header Files",
"sourceIndexes" :
[
2,
4
]
}
],
Expand All @@ -149,6 +104,28 @@
"compileGroupIndex" : 0,
"path" : "src/main.cpp",
"sourceGroupIndex" : 0
},
{
"backtrace" : 1,
"compileGroupIndex" : 0,
"path" : "C:/Users/gfl56326/Documents/newstarter/exercises-cpp/jimoh_yusuf/ex02_oo_basics/src/Rectangle.cpp",
"sourceGroupIndex" : 0
},
{
"backtrace" : 1,
"path" : "C:/Users/gfl56326/Documents/newstarter/exercises-cpp/jimoh_yusuf/ex02_oo_basics/src/Rectangle.h",
"sourceGroupIndex" : 1
},
{
"backtrace" : 1,
"compileGroupIndex" : 0,
"path" : "C:/Users/gfl56326/Documents/newstarter/exercises-cpp/jimoh_yusuf/ex02_oo_basics/src/Circle.cpp",
"sourceGroupIndex" : 0
},
{
"backtrace" : 1,
"path" : "C:/Users/gfl56326/Documents/newstarter/exercises-cpp/jimoh_yusuf/ex02_oo_basics/src/Circle.h",
"sourceGroupIndex" : 1
}
],
"type" : "EXECUTABLE"
Expand Down
Binary file modified exercises-cpp/jimoh_yusuf/ex01_basics/cmake-build-debug/.ninja_deps
View file
Binary file not shown.
14 changes: 9 additions & 5 deletions exercises-cpp/jimoh_yusuf/ex01_basics/cmake-build-debug/.ninja_log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
# ninja log v5
8 3051 7386888511334206 CMakeFiles/WordCounter.dir/src/main.cpp.obj 86154237dcb42254
15 3081 7386932941009066 CMakeFiles/WordCounter.dir/src/main.cpp.obj 542f860eccc2fb0a
31 176 7386876562470803 CMakeFiles/WordCounter.dir/src/Triangle.cpp.obj 303ff5c4e45d54e5
19 626 7386876566971174 CMakeFiles/WordCounter.dir/src/Square.cpp.obj e0094a043ca25abe
3053 5238 7386888533299834 bin/WordCounter.exe 7d65be3730c2ab60
12 2164 7386906975292033 bin/WordCounter.exe 7d65be3730c2ab60
66 391 7386796154549875 CMakeFiles/WordCounter.dir/src/ShapeSorter.cpp.obj 8076f12ae963f28
31 176 7386876562470803 CMakeFiles/WordCounter.dir/src/Triangle.cpp.obj 303ff5c4e45d54e5
7 514 7386887213038788 CMakeFiles/WordCounter.dir/C_/Users/gfl56326/Documents/newstarter/exercises-cpp/jimoh_yusuf/ex02_oo_basics/src/main.cpp.obj 7ee5aa959a31254b
4 440 7386888832483927 build.ninja 2f1fe48deb7834c8
25 629 7386932916614281 CMakeFiles/WordCounter.dir/C_/Users/gfl56326/Documents/newstarter/exercises-cpp/jimoh_yusuf/ex02_oo_basics/src/main.cpp.obj 383e3fe3ff19198e
7 420 7386953111981927 build.ninja 2f1fe48deb7834c8
17 157 7386860660992988 CMakeFiles/WordCounter.dir/src/Squaree.cpp.obj ca12d5043527a49d
13 2182 7386935426254388 WordCounter.exe 22ec09b1b0baf071
7 639 7386957144422552 CMakeFiles/WordCounter.dir/C_/Users/gfl56326/Documents/newstarter/exercises-cpp/jimoh_yusuf/ex02_oo_basics/src/Rectangle.cpp.obj ce1123a11a563de0
18 807 7386957146118258 CMakeFiles/WordCounter.dir/C_/Users/gfl56326/Documents/newstarter/exercises-cpp/jimoh_yusuf/ex02_oo_basics/src/Circle.cpp.obj db4d5b735a3d35ab
808 3002 7386957167970018 WordCounter.exe b8f99df30967da9a
4 changes: 2 additions & 2 deletions exercises-cpp/jimoh_yusuf/ex01_basics/cmake-build-debug/Testing/Temporary/LastTest.log
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Start testing: May 29 13:29 GMT Summer Time
Start testing: May 29 15:34 GMT Summer Time
----------------------------------------------------------
End testing: May 29 13:29 GMT Summer Time
End testing: May 29 15:34 GMT Summer Time
Loading

0 comments on commit db905dd

Please sign in to comment.