summaryrefslogtreecommitdiffstats
path: root/src/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r--src/CMakeLists.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index efbd681..07e487d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,14 @@
# CBot shared library is built separately
add_subdirectory(CBot)
+<<<<<<< HEAD
+
+# Tools directory is built separately
+add_subdirectory(tools)
+
+# Tests
+add_subdirectory(graphics/engine/test)
+=======
+>>>>>>> dev-ui
# Configure options