Skip to content

Commit

Permalink
Changes:
Browse files Browse the repository at this point in the history
- Employed a modern cmake approach
- cmake 3.10 required
- fixed lots of warnings

Squashed commit of the following:

commit 51fdaf7
Author: Gabriel Nuetzi <[email protected]>
Date:   Sun Jan 28 23:01:02 2018 +0100

    isntall dir, travis

commit ca7a051
Author: Gabriel Nuetzi <[email protected]>
Date:   Sun Jan 28 22:48:01 2018 +0100

    travis

commit 806ad81
Author: Gabriel Nuetzi <[email protected]>
Date:   Sun Jan 28 22:34:53 2018 +0100

    travis

commit cec068b
Author: Gabriel Nuetzi <[email protected]>
Date:   Sun Jan 28 22:29:56 2018 +0100

    travis

commit 8a9df0e
Author: Gabriel Nuetzi <[email protected]>
Date:   Sun Jan 28 22:28:26 2018 +0100

    travis

commit e401cdd
Author: Gabriel Nuetzi <[email protected]>
Date:   Sun Jan 28 22:21:53 2018 +0100

    travis

commit 28fba4b
Author: Gabriel Nuetzi <[email protected]>
Date:   Sun Jan 28 22:14:04 2018 +0100

    travis

commit 6b3666c
Author: Gabriel Nuetzi <[email protected]>
Date:   Sun Jan 28 22:10:26 2018 +0100

    travis

commit 7c7dd87
Author: Gabriel Nuetzi <[email protected]>
Date:   Sun Jan 28 22:08:06 2018 +0100

    travis

commit de4bc6d
Author: Gabriel Nuetzi <[email protected]>
Date:   Sun Jan 28 21:58:26 2018 +0100

    deleted wrong comitted folder

commit 0b931b1
Author: Gabriel Nuetzi <[email protected]>
Date:   Sun Jan 28 21:55:29 2018 +0100

    travis

commit 2bbca4b
Author: Gabriel Nuetzi <[email protected]>
Date:   Sun Jan 28 21:55:02 2018 +0100

    ignore

commit 860d956
Author: Gabriel Nuetzi <[email protected]>
Date:   Sun Jan 28 21:35:13 2018 +0100

    travis

commit 5cc386c
Author: Gabriel Nuetzi <[email protected]>
Date:   Sun Jan 28 20:54:31 2018 +0100

    travis and build

commit 47833f1
Author: Gabriel Nuetzi <[email protected]>
Date:   Sun Jan 28 20:14:14 2018 +0100

    eveything builds tests ok

commit 6f2b68e
Author: Gabriel Nuetzi <[email protected]>
Date:   Sun Jan 28 20:14:05 2018 +0100

    everyhing builds, tests ok

commit 3f9f0fe
Author: Gabriel Nuetzi <[email protected]>
Date:   Sun Jan 28 19:46:31 2018 +0100

    work in progress

commit 57516a8
Author: Gabriel Nuetzi <[email protected]>
Date:   Sun Jan 28 19:09:58 2018 +0100

    libraryUsage build!

commit 0315680
Author: Gabriel Nuetzi <[email protected]>
Date:   Sun Jan 28 19:03:52 2018 +0100

    build, work in progress

commit 20c1033
Author: Gabriel Nuetzi <[email protected]>
Date:   Sat Jan 27 03:24:34 2018 +0100

    Library configured, modern cmake

commit bffc6f8
Merge: e22339a 34b5aa8
Author: Gabriel Nuetzi <[email protected]>
Date:   Fri Jan 26 23:50:12 2018 +0100

    Merge branch 'master' into dev
  • Loading branch information
gabyx committed Jan 28, 2018
1 parent 34b5aa8 commit c28d0c8
Show file tree
Hide file tree
Showing 91 changed files with 11,722 additions and 12,098 deletions.
14 changes: 8 additions & 6 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ AlignEscapedNewlinesLeft: true
AlignOperands: true
AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false
AllowShortBlocksOnASingleLine: true
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: false
AllowShortFunctionsOnASingleLine: true
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: false
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: true
AlwaysBreakTemplateDeclarations: false
BinPackArguments: false
BinPackParameters: false
BraceWrapping:
Expand All @@ -38,8 +38,8 @@ BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: true
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 120
CommentPragmas: '^ IWYU pragma:'
ColumnLimit: 0
CommentPragmas: '^ IWYU pragma:'
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Expand All @@ -63,10 +63,11 @@ KeepEmptyLinesAtTheStartOfBlocks: false
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
NamespaceIndentation: All
ObjCBlockIndentWidth: 2
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: false
IndentPPDirectives: AfterHash
PenaltyBreakBeforeFirstCallParameter: 1
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
Expand All @@ -77,6 +78,7 @@ PointerAlignment: Left
ReflowComments: true
SortIncludes: true
SpaceAfterCStyleCast: false
SpaceAfterTemplateKeyword: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: false
SpaceInEmptyParentheses: false
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
CMakeFiles
__pycache__
.ipynb_checkpoints
build/
build*
install*
.DS_Store
.vscode/.*
.vscode/c_cpp_properties*
16 changes: 5 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,20 @@ matrix:
include:
- env: GCC_VERSION=5 APPROXMVBB_CACHE_DIR="$HOME/ApproxMVBBCache"
os: linux
dist: precise
addons: &gcc5
apt:
packages:
- g++-5
sources:
- ubuntu-toolchain-r-test
sources: ['ubuntu-toolchain-r-test']
packages: ['g++-5']

- env: GCC_VERSION=6 APPROXMVBB_CACHE_DIR="$HOME/ApproxMVBBCache"
os: linux
dist: precise
addons: &gcc6
apt:
packages:
- g++-6
sources:
- ubuntu-toolchain-r-test
sources: ['ubuntu-toolchain-r-test']
packages: ['g++-6']

- env: CLANG_VERSION=5.0 APPROXMVBB_CACHE_DIR="$HOME/ApproxMVBBCache"
os: linux
dist: precise
addons: &clang5
apt:
packages:
Expand All @@ -42,6 +35,7 @@ matrix:

- env: APPROXMVBB_CACHE_DIR="$HOME/ApproxMVBBCache"
os: osx
osx_image: xcode9.2
compiler: clang

before_install:
Expand Down
21 changes: 21 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
// Verwendet IntelliSense zum Ermitteln möglicher Attribute.
// Zeigen Sie auf vorhandene Attribute, um die zugehörigen Beschreibungen anzuzeigen.
// Weitere Informationen finden Sie unter https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [

{
"name": "(lldb) Launch",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/example/ApproxMVBBExample",
"args": [],
"stopAtEntry": false,
"cwd": "${workspaceFolder}",
"environment": [],
"externalConsole": true,
"MIMode": "lldb"
}
]
}
38 changes: 38 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"files.associations": {
"*.tcc": "cpp",
"hashtable": "cpp",
"functional": "cpp",
"type_traits": "cpp",
"utility": "cpp",
"tuple": "cpp",
"cctype": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"complex": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"exception": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"limits": "cpp",
"memory": "cpp",
"new": "cpp",
"ostream": "cpp",
"sstream": "cpp",
"stdexcept": "cpp",
"streambuf": "cpp",
"cstdint": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"typeinfo": "cpp"
},
"cmake.configureArgs": ["-DPugiXML_DIR=/usr/local/opt/pugixml/lib/cmake/pugixml"]
}
Loading

0 comments on commit c28d0c8

Please sign in to comment.