Skip to content

Commit 34d605f

Browse files
authored
Merge branch 'master' into feature/integrate-gcov
2 parents 957c6fe + 0af7de3 commit 34d605f

File tree

13 files changed

+271
-155
lines changed

13 files changed

+271
-155
lines changed

.ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
source/tests/googletest/*

.travis.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
language: c++
1+
language: sh
22

33
env:
44
global:
@@ -49,9 +49,21 @@ matrix:
4949
- cmake
5050
- g++-5
5151

52+
- os: windows
53+
env:
54+
- CMAKE_GENERATOR_OVERRIDE="Visual Studio 15 2017 Win64"
55+
- BUILD_DIR=build-debug
56+
- CMAKE_CONFIGURATION=debug
57+
58+
- os: windows
59+
env:
60+
- CMAKE_GENERATOR_OVERRIDE="Visual Studio 15 2017 Win64"
61+
- BUILD_DIR=build
62+
- CMAKE_CONFIGURATION=release
5263

5364
before_script:
5465
- eval "${MATRIX_EVAL}"
66+
- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then export PATH="$PATH:/c/Program Files/CMake/bin"; fi
5567
- chmod +x ./configure
5668
- ./configure
5769
- ./configure $CMAKE_CONFIGURATION
@@ -60,4 +72,3 @@ script:
6072
- cmake --build $BUILD_DIR
6173
- cmake --build $BUILD_DIR --target test
6274
- cmake --build $BUILD_DIR --target coverage
63-

ADAPT

Lines changed: 0 additions & 99 deletions
This file was deleted.

ADAPT.md

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
2+
To adapt this template to your own project, follow these steps:
3+
4+
5+
In the root directory adapt/change/do the following:
6+
--------------------------------------------------------------------
7+
8+
* [ ] Edit AUTHORS
9+
* [ ] Edit LICENSE
10+
* [ ] Edit README.md
11+
* [ ] Rename ./template-config.cmake -> <project>-config.cmake
12+
13+
CMakeLists.txt:
14+
* [ ] Set META_PROJECT_*
15+
* [ ] Set META_VERSION_*
16+
* [ ] Set META_AUTHOR_*
17+
* [ ] Set META_CMAKE_INIT_SHA (to the commit hash of the applied cmake-init template, e.g., to 83d7cbc29a6fcb74a98498e5b0fcebd953d9d5cc)
18+
* [ ] Adjust INSTALL_* to the desired install locations for all systems (defaults should be fine for a start)
19+
20+
21+
In subdirectory "./deploy/" do:
22+
--------------------------------------------------------------------
23+
24+
deploy/CMakeLists.txt:
25+
* [ ] Substitute pack-template.cmake -> pack-<project>.cmake
26+
* [ ] Exchange deploy/images/logo.ico
27+
* [ ] Exchange deploy/images/logo.bmp
28+
* [ ] Exchange deploy/images/logo.png
29+
* [ ] Rename deploy/packages/pack-template.cmake -> pack-<project>.cmake
30+
31+
deploy/packages/pack-<project>.cmake:
32+
* [ ] Adjust OPTION_PACK_GENERATOR to your liking for all systems
33+
* [ ] Adjust package options, e.g., CPACK_DEBIAN_PACKAGE_DEPENDS, CPACK_DEBIAN_PACKAGE_SECTION, CPACK_DEBIAN_PACKAGE_PRIORITY, CPACK_RPM_PACKAGE_LICENSE, CPACK_RPM_PACKAGE_GROUP, ...
34+
35+
In subdirectory "./source/" do:
36+
--------------------------------------------------------------------
37+
38+
* [ ] Rename template-version.h -> <project>-version.h
39+
40+
41+
In subdirectory "./source/examples/fibcmd" do:
42+
--------------------------------------------------------------------
43+
44+
source/fibcmd/main.cpp:
45+
* [ ] Substitute template-version.h -> <project>-version.h
46+
* [ ] Substitute TEMPLATE_VERSION -> <PROJECT>_VERSION
47+
48+
49+
In subdirectory "./source/codegeneration/" do:
50+
--------------------------------------------------------------------
51+
52+
* [ ] Remove/replace *_features.h for project-specific compiler feature detection headers (generate with current CMake and place here old cmake compatibility)
53+
54+
55+
In subdirectory "./docs/api-docs/" do:
56+
--------------------------------------------------------------------
57+
58+
docs/api-docs/doxyfile.in:
59+
* [ ] Adjust INPUT tag (list of doxygen annotated sources)
60+
61+
docs/api-docs/CMakeLists.txt
62+
* [ ] Adjust DEPENDS parameter to include all targets of project
63+
64+
65+
In subdirectory "./docs/manual/" do:
66+
--------------------------------------------------------------------
67+
68+
docs/manual/cmake-init.tex:
69+
* [ ] Rename to match own project name
70+
71+
docs/manual/CMakeLists.txt
72+
* [ ] Adjust source and pdf file name
73+
74+
75+
In subdirectory "./source/tests/" do:
76+
--------------------------------------------------------------------
77+
78+
source/tests/CMakeLists.txt:
79+
* [ ] Set META_PROJECT_NAME
80+
81+
82+
General stuff left to do:
83+
--------------------------------------------------------------------
84+
85+
* [ ] Rename and adjust targets in source/
86+
* [ ] Add new targets to source/CMakeLists.txt
87+
* [ ] Add new targets to ./{project}-config.cmake
88+
* [ ] Add new targets to the INPUT tag in docs/api-docs/doxyfile.in
89+
* [ ] Remove data/DATA_FOLDER.txt
90+
* [ ] Populate data/
91+
* [ ] Remove ADAPT.md

0 commit comments

Comments
 (0)