Merge pull request #6 from tachyon-computer/glamhoth-cmake-submodule

CMake: Change URL to cmake submodule
tachyon-computer · Nov 30, 2022 · 0b0ed36 · 0b0ed36
2 parents 1fcd78c + 8f98ace
commit 0b0ed36
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -42,6 +42,7 @@ jobs:
             -D CMAKE_CXX_COMPILER=clang++-12 \
             -D CMAKE_BUILD_TYPE=Debug \
             -D TACHYON_OPTIONS_BUILD_TESTING=ON \
+            -D TACHYON_OPTIONS_ENABLE_PCH=OFF \
             -D TACHYON_OPTIONS_ENABLE_COVERAGE=ON \
             -D TACHYON_TOOLS_ENABLE_TIDY=ON \
             -D TACHYON_TOOLS_ENABLE_FORMATTING=OFF \

diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "cmake"]
 	path = cmake
-	url = git@github.com:Glamhoth/cmake
-    branch = glamhoth-init-repo
+	url = git@github.com:tachyon-computer/cmake
+    branch = master
 [submodule "extern/Catch2"]
 	path = extern/Catch2
 	url = https://github.com/catchorg/Catch2

diff --git a/cmake b/cmake
diff --git a/extern/Catch2 b/extern/Catch2
diff --git a/src/app/app.hh b/src/app/app.hh
@@ -6,6 +6,8 @@
 
 #pragma once
 
+#include <string>
+
 namespace app {
 
 /**

diff --git a/src/app/main.cc b/src/app/main.cc
@@ -5,6 +5,7 @@
  */
 
 #include <iostream>
+#include <memory>
 
 #include "app.hh"
 

diff --git a/src/lib/include/StubLib/lib.hh b/src/lib/include/StubLib/lib.hh
@@ -6,6 +6,8 @@
 
 #pragma once
 
+#include <string>
+
 namespace lib {
 
 /**