diff --git a/Doxygen/doxyfig b/Doxygen/doxyfig index 851a989..6274cfa 100644 --- a/Doxygen/doxyfig +++ b/Doxygen/doxyfig @@ -829,7 +829,7 @@ WARN_LOGFILE = # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # Note: If this tag is empty the current directory is searched. -INPUT = "../Src/StringTools/" +INPUT = "../Src/" # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/Exec/CMakeLists.txt b/Exec/CMakeLists.txt new file mode 100644 index 0000000..d42e35f --- /dev/null +++ b/Exec/CMakeLists.txt @@ -0,0 +1,10 @@ +cmake_minimum_required(VERSION 3.16) +project(Exec) + +set(CMAKE_CXX_STANDARD 17) + +include_directories(../Src) +link_directories(../Src/cmake-build-debug) + +add_executable(Exec main.cpp) +target_link_libraries(Exec StringTools) diff --git a/Src/Exec/main.cpp b/Exec/main.cpp similarity index 76% rename from Src/Exec/main.cpp rename to Exec/main.cpp index 4beeed7..b833214 100644 --- a/Src/Exec/main.cpp +++ b/Exec/main.cpp @@ -1,5 +1,5 @@ #include -#include +#include int main() { diff --git a/Src/StringTools/CMakeLists.txt b/Src/CMakeLists.txt similarity index 100% rename from Src/StringTools/CMakeLists.txt rename to Src/CMakeLists.txt diff --git a/Src/Exec/CMakeLists.txt b/Src/Exec/CMakeLists.txt deleted file mode 100644 index d5ba9c1..0000000 --- a/Src/Exec/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -cmake_minimum_required(VERSION 3.16) -project(Exec) - -set(CMAKE_CXX_STANDARD 17) - -include_directories(..) -link_directories(../StringTools/cmake-build-debug) - -add_executable(Exec main.cpp) -target_link_libraries(Exec Stringtools) diff --git a/Src/StringTools/StringTools.cpp b/Src/StringTools.cpp similarity index 100% rename from Src/StringTools/StringTools.cpp rename to Src/StringTools.cpp diff --git a/Src/StringTools/StringTools.h b/Src/StringTools.h similarity index 100% rename from Src/StringTools/StringTools.h rename to Src/StringTools.h diff --git a/Src/StringTools.sln b/Src/StringTools.sln deleted file mode 100644 index f175fda..0000000 --- a/Src/StringTools.sln +++ /dev/null @@ -1,57 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30907.101 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StringTools", "StringTools\StringTools.vcxproj", "{0270AC5E-EBA3-4D8F-8D50-995FD44959B4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test\Test.vcxproj", "{64EF270C-0A13-4AD8-8D50-23A1CEEBF98B}" - ProjectSection(ProjectDependencies) = postProject - {0270AC5E-EBA3-4D8F-8D50-995FD44959B4} = {0270AC5E-EBA3-4D8F-8D50-995FD44959B4} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Exec", "Exec\Exec.vcxproj", "{02F9FA44-902F-4695-846B-0B45E952A962}" - ProjectSection(ProjectDependencies) = postProject - {0270AC5E-EBA3-4D8F-8D50-995FD44959B4} = {0270AC5E-EBA3-4D8F-8D50-995FD44959B4} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0270AC5E-EBA3-4D8F-8D50-995FD44959B4}.Debug|x64.ActiveCfg = Debug|x64 - {0270AC5E-EBA3-4D8F-8D50-995FD44959B4}.Debug|x64.Build.0 = Debug|x64 - {0270AC5E-EBA3-4D8F-8D50-995FD44959B4}.Debug|x86.ActiveCfg = Debug|Win32 - {0270AC5E-EBA3-4D8F-8D50-995FD44959B4}.Debug|x86.Build.0 = Debug|Win32 - {0270AC5E-EBA3-4D8F-8D50-995FD44959B4}.Release|x64.ActiveCfg = Release|x64 - {0270AC5E-EBA3-4D8F-8D50-995FD44959B4}.Release|x64.Build.0 = Release|x64 - {0270AC5E-EBA3-4D8F-8D50-995FD44959B4}.Release|x86.ActiveCfg = Release|Win32 - {0270AC5E-EBA3-4D8F-8D50-995FD44959B4}.Release|x86.Build.0 = Release|Win32 - {64EF270C-0A13-4AD8-8D50-23A1CEEBF98B}.Debug|x64.ActiveCfg = Debug|x64 - {64EF270C-0A13-4AD8-8D50-23A1CEEBF98B}.Debug|x64.Build.0 = Debug|x64 - {64EF270C-0A13-4AD8-8D50-23A1CEEBF98B}.Debug|x86.ActiveCfg = Debug|Win32 - {64EF270C-0A13-4AD8-8D50-23A1CEEBF98B}.Debug|x86.Build.0 = Debug|Win32 - {64EF270C-0A13-4AD8-8D50-23A1CEEBF98B}.Release|x64.ActiveCfg = Release|x64 - {64EF270C-0A13-4AD8-8D50-23A1CEEBF98B}.Release|x64.Build.0 = Release|x64 - {64EF270C-0A13-4AD8-8D50-23A1CEEBF98B}.Release|x86.ActiveCfg = Release|Win32 - {64EF270C-0A13-4AD8-8D50-23A1CEEBF98B}.Release|x86.Build.0 = Release|Win32 - {02F9FA44-902F-4695-846B-0B45E952A962}.Debug|x64.ActiveCfg = Debug|x64 - {02F9FA44-902F-4695-846B-0B45E952A962}.Debug|x64.Build.0 = Debug|x64 - {02F9FA44-902F-4695-846B-0B45E952A962}.Debug|x86.ActiveCfg = Debug|Win32 - {02F9FA44-902F-4695-846B-0B45E952A962}.Debug|x86.Build.0 = Debug|Win32 - {02F9FA44-902F-4695-846B-0B45E952A962}.Release|x64.ActiveCfg = Release|x64 - {02F9FA44-902F-4695-846B-0B45E952A962}.Release|x64.Build.0 = Release|x64 - {02F9FA44-902F-4695-846B-0B45E952A962}.Release|x86.ActiveCfg = Release|Win32 - {02F9FA44-902F-4695-846B-0B45E952A962}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {9F255CFD-0ECB-44F5-A3D8-3E3B2AE2C387} - EndGlobalSection -EndGlobal diff --git a/Src/Test/CMakeLists.txt b/Test/CMakeLists.txt similarity index 66% rename from Src/Test/CMakeLists.txt rename to Test/CMakeLists.txt index da0e176..da8c416 100644 --- a/Src/Test/CMakeLists.txt +++ b/Test/CMakeLists.txt @@ -3,8 +3,8 @@ project(Tests) set(CMAKE_CXX_STANDARD 17) -include_directories(..) -link_directories(../StringTools/cmake-build-debug) +include_directories(../Src) +link_directories(../Src/cmake-build-debug) add_executable(Tests Catch2.h @@ -15,4 +15,4 @@ add_executable(Tests Replace_String.cpp ) -target_link_libraries(Tests Stringtools) +target_link_libraries(Tests StringTools) diff --git a/Src/Test/Catch2.h b/Test/Catch2.h similarity index 100% rename from Src/Test/Catch2.h rename to Test/Catch2.h diff --git a/Src/Test/Lower.cpp b/Test/Lower.cpp similarity index 93% rename from Src/Test/Lower.cpp rename to Test/Lower.cpp index 4c8abef..8e4fe27 100644 --- a/Src/Test/Lower.cpp +++ b/Test/Lower.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Catch2.h" // Tests that lowering an empty string returns an empty string diff --git a/Src/Test/Replace_Char.cpp b/Test/Replace_Char.cpp similarity index 95% rename from Src/Test/Replace_Char.cpp rename to Test/Replace_Char.cpp index a880e59..72d5622 100644 --- a/Src/Test/Replace_Char.cpp +++ b/Test/Replace_Char.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Catch2.h" // Tests that replacing something in an empty string returns an empty string diff --git a/Src/Test/Replace_String.cpp b/Test/Replace_String.cpp similarity index 95% rename from Src/Test/Replace_String.cpp rename to Test/Replace_String.cpp index f2ef15c..853d411 100644 --- a/Src/Test/Replace_String.cpp +++ b/Test/Replace_String.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Catch2.h" // Tests that replacing something in an empty string returns an empty string diff --git a/Src/Test/Upper.cpp b/Test/Upper.cpp similarity index 93% rename from Src/Test/Upper.cpp rename to Test/Upper.cpp index ec2087e..8d34fa2 100644 --- a/Src/Test/Upper.cpp +++ b/Test/Upper.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Catch2.h" // Tests that uppering an empty string returns an empty string diff --git a/Src/Test/main.cpp b/Test/main.cpp similarity index 100% rename from Src/Test/main.cpp rename to Test/main.cpp