Skip to content

Commit

Permalink
Merge dev into main for v0.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
albin-johansson authored Nov 26, 2020
2 parents c40eb1b + 9ec0096 commit b57add8
Show file tree
Hide file tree
Showing 462 changed files with 47,231 additions and 1 deletion.
33 changes: 33 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
image: Visual Studio 2019

version: '0.1.0-{build}'

install:
- cmake --version # expect >= 3.16
- ninja --version # expect >= 1.10

- set QT_VERSION=5.15.1
- set Qt5_PATH=C:\Qt\%QT_VERSION%\msvc2019_64
- set QT_QPA_PLATFORM_PLUGIN_PATH=%Qt5_PATH%\plugins\platforms
- set PATH=%PATH%;%Qt5_PATH%\bin;%
- set BOOST_ROOT=C:\Libraries\boost_1_73_0

# Updates PATH to support command-line usage of compiler
- call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"

before_build:
- cd %APPVEYOR_BUILD_FOLDER%

# Copy Qt runtime binaries to our bin folder
- xcopy /e /i %Qt5_PATH%\bin\*.dll %cd%\bin

- mkdir build
- cd build
- cmake .. -DCMAKE_BUILD_TYPE=Debug -G Ninja

build_script:
- ninja

test_script:
- cd test
- testTactile
35 changes: 35 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---
BasedOnStyle: Google
IndentWidth: 2
---
Language: Cpp
Standard: c++20
DerivePointerAlignment: false
PointerAlignment: Left
AllowAllParametersOfDeclarationOnNextLine: false

AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None

BinPackParameters: false
BinPackArguments: false

BreakBeforeBraces: Custom
BraceWrapping:
AfterEnum: true
AfterStruct: true
AfterClass: true
AfterFunction: true
SplitEmptyRecord: false
SplitEmptyFunction: false

AllowShortFunctionsOnASingleLine: None
AllowShortBlocksOnASingleLine: Never

BreakConstructorInitializers: BeforeColon
AllowAllConstructorInitializersOnNextLine: false

AllowShortLambdasOnASingleLine: None
AllowAllArgumentsOnNextLine: false

BreakInheritanceList: BeforeColon
13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,16 @@
*.exe
*.out
*.app

compile_commands.json

.vs
.vscode
.idea
doxygen-out
build
cmake-build-*

# Allow all necessary installer data and metainformation
!installer/packages/com.albinjohansson.tactile/**/*
!installer/*
34 changes: 34 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
dist: focal # Ubuntu 20.04

language: cpp

notifications:
email: false

compiler: clang

addons:
apt:
packages:
- cmake
- qt5-default
- clang-12
- ninja-build
- build-essential
- libgl1-mesa-dev
- libboost-dev

before_script:
- export CC=/usr/bin/clang-12
- export CXX=/usr/bin/clang++-12

- sudo apt-get update

- clang --version
- cmake --version

script:
- mkdir build
- cd build
- cmake .. -DCMAKE_BUILD_TYPE=Debug -GNinja
- ninja
32 changes: 32 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
cmake_minimum_required(VERSION 3.12)

project(tactile CXX)

set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
set(CMAKE_PREFIX_PATH "$ENV{BOOST_ROOT}; $ENV{Qt5_PATH}")

include(Utilities)

find_env_var(Qt5_PATH)
find_env_var(BOOST_ROOT)

foreach (path ${CMAKE_PREFIX_PATH})
message("CMake prefix path: " ${path})
endforeach (path)

set(LIBRARY_DIR ${PROJECT_SOURCE_DIR}/lib)

set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_STANDARD 20)

set(TACTILE_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})

find_package(Qt5 COMPONENTS Core Widgets Gui Xml REQUIRED)
find_package(Boost REQUIRED)

set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)

add_subdirectory(src)
add_subdirectory(test)
Loading

0 comments on commit b57add8

Please sign in to comment.