summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Etienne <40911701+Leonetienne@users.noreply.github.com>2022-02-12 03:48:14 +0100
committerGitHub <noreply@github.com>2022-02-12 03:48:14 +0100
commit9755b729157d8205c3f054c69d2aa632402d3942 (patch)
treee4e19f945f299efeb365a944312fc3d8b94a6797
parent74865b20a48980438d8a3cb280fa276944005d54 (diff)
parent719051affc9dcf477e1e919f681538246ca0d1b1 (diff)
Merge pull request #3 from Leonetienne/feature/streamlined-build
It shouwd buiwd finye nyow :33 <3
-rw-r--r--CMakeLists.txt20
m---------StringTools0
-rw-r--r--main.cpp2
-rw-r--r--readme.md19
4 files changed, 36 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1bf1f1d..d54dec2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,22 @@
cmake_minimum_required(VERSION 3.16)
project(Uwwwu)
+# Set C++ standard
set(CMAKE_CXX_STANDARD 17)
-include_directories(StringTools/StringTools)
-link_directories(StringTools/StringTools/StringTools/)
+# Add build dependency for StringTools
+add_subdirectory(StringTools/src/StringTools StringTools/src/StringTools/cmake-build-release)
-add_executable(Uwwwu main.cpp)
-target_link_libraries(Uwwwu Stringtools)
+# Add StringTools src dir to include dir list
+include_directories(StringTools/src/StringTools)
+
+# Add StringTools build dir to library repository list
+link_directories(StringTools/src/StringTools/cmake-build-release)
+
+# Add absolutely kawaii sources to Uwwwu <3
+add_executable(Uwwwu
+ main.cpp
+)
+
+# Link StringTools library
+target_link_libraries(Uwwwu StringTools)
diff --git a/StringTools b/StringTools
-Subproject f4e36ec9af5002eaa51c742faa10e4cbc7d66de
+Subproject a8b8d557692823931bb41dcd55627080f55b609
diff --git a/main.cpp b/main.cpp
index a58ebd3..fe48cd4 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,5 +1,5 @@
#include <iostream>
-#include <StringTools/StringTools.h>
+#include <StringTools.h>
#include <string>
#include <sstream>
#include <functional>
diff --git a/readme.md b/readme.md
index e3ef340..6381484 100644
--- a/readme.md
+++ b/readme.md
@@ -6,4 +6,23 @@ So i made twis.
You can eitwer compiwe it yoursewf, or downwoad eitwer twe debian, or macos buiwd fwom twe [weweases tab](https://github.com/Leonetienne/UwwwuPP/releases). It shouwd compiwe on evewy pwatform twat suwpports cmake.
+## Compiwe instwuctions
+To do so, make suwe you haf cmake instawwed.
+Clown twis repositowy, and instal al dependencies via:
+```
+$ git submodule update --init --recursive
+```
+
+If it won't pul, you might haf to switch twe submoduwes remotes out for tweir https-vawiants. Twey awe git@ by defauwt.
+Twen <3 al you haf to do is to start twe mega ct3.14 buiwd:
+```
+$ cmake . && make
+```
+
+Lastwy, vewify twat your buiwd works
+```
+$ ./Uwwwu Hi, thanks for checking by!
+Hiiiiiii, you're twe best :33 xoxo for checking by!
+```
+
:33333 enyoi <3