Skip to content

Commit

Permalink
fix merge conf
Browse files Browse the repository at this point in the history
  • Loading branch information
rossGardiner committed Mar 15, 2022
2 parents 04ed11b + 49dc48b commit bad0daf
Show file tree
Hide file tree
Showing 35 changed files with 4,948 additions and 2 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/cmake_build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CMake
name: CMake build and test

on:
push:
Expand Down Expand Up @@ -26,4 +26,7 @@ jobs:
- name: Build
run: bash build.sh

- name: Test
run: bash test.sh


2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
# Default Doxyfile build documentation to html directory.
# Change the directory if changes in Doxyfile
publish_dir: ./html
publish_dir: ./docs/
17 changes: 17 additions & 0 deletions .github/workflows/github-actions-demo.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: GitHub Actions Demo
on: [push]
jobs:
Explore-GitHub-Actions:
runs-on: ubuntu-latest
steps:
- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
- run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
- name: Check out repository code
uses: actions/checkout@v2
- run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
- run: echo "🖥️ The workflow is now ready to test your code on the runner."
- name: List files in the repository
run: |
ls ${{ github.workspace }}
- run: echo "🍏 This job's status is ${{ job.status }}."
23 changes: 23 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ bin-release/
# Other files and folders
.settings/
Signapse.code-workspace
lib/
build/
opencv_build/
opencv_src

#VSCode
.vscode/

# Executables
*.swf
Expand All @@ -19,3 +26,19 @@ Signapse.code-workspace
# information for Eclipse / Flash Builder.

*.pdf
*.zip

#CMake
CMakeLists.txt.user
CMakeCache.txt
CMakeFiles
CMakeScripts
Testing
Makefile
cmake_install.cmake
install_manifest.txt
compile_commands.json
CTestTestfile.cmake
_deps


3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "doxygen-awesome-css"]
path = doxygen-awesome-css
url = https://github.com/jothepro/doxygen-awesome-css.git
15 changes: 15 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
cmake_minimum_required(VERSION 3.0)
project(Signapse)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -pthread")

add_subdirectory(src)
add_subdirectory(test)

enable_testing()
add_test(taskmaster_unit_test taskmaster_test)
add_test(camera_unit_test camera_test)

set_target_properties(Signapse PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../bin/)
set_target_properties(taskmaster_test PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
set_target_properties(camera_test PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
add_compile_options(-Wall)
6 changes: 6 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
mkdir build
cd build
cmake ..
make Signapse
make taskmaster_test
make camera_test
Empty file added clean.sh
Empty file.
Loading

0 comments on commit bad0daf

Please sign in to comment.