Skip to content

Commit 180d49b

Browse files
committed
fixed review findings
- removed IDE and OS specifics from .gitignore - added not MSVC check to ftrace cmake Options.cmake - added hint for adaption to boilerplate repository by Jason Turner
1 parent 92d9963 commit 180d49b

3 files changed

Lines changed: 4 additions & 28 deletions

File tree

.gitignore

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,3 @@ conan-cache/
1111

1212
# User spesific settings
1313
CMakeUserPresets.json
14-
15-
# IDE files
16-
.vs/
17-
.idea/
18-
.vscode/
19-
!.vscode/settings.json
20-
!.vscode/tasks.json
21-
!.vscode/launch.json
22-
!.vscode/extensions.json
23-
*.swp
24-
*~
25-
_ReSharper*
26-
*.log
27-
28-
# OS Generated Files
29-
.DS_Store
30-
.AppleDouble
31-
.LSOverride
32-
._*
33-
.Spotlight-V100
34-
.Trashes
35-
.Trash-*
36-
$RECYCLE.BIN/
37-
.TemporaryItems
38-
ehthumbs.db
39-
Thumbs.db

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Ongoing project of the Zühlke Germany **Modern C++ Topic Group**.
77

88
With this project, we want to provide an example and starting point for C++ projects (embedded and otherwise), especially regarding tooling.
99

10-
The project has initially been forked/copied from [Jason Turner's cpp_starter_project](https://github.com/lefticus/cpp_starter_project).
10+
The project has initially been forked/copied from [Jason Turner's cpp_starter_project](https://github.com/lefticus/cpp_starter_project) and is customised by Zühlke members and adapted to [Jason Turner's cmake_conan_boilerplate_template](https://github.com/cpp-best-practices/cmake_conan_boilerplate_template).
1111

1212

1313
## Build Status

cmake/Options.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
OPTION(ENABLE_BUILD_WITH_TIME_TRACE "Enable -ftime-trace to generate time tracing .json files on clang" OFF)
1+
IF(NOT MSVC)
2+
OPTION(ENABLE_BUILD_WITH_TIME_TRACE "Enable -ftime-trace to generate time tracing .json files on clang" OFF)
3+
ENDIF()
24

35
OPTION(BUILD_SHARED_LIBS "Enable compilation of shared libraries" OFF)
46
OPTION(ENABLE_TESTING "Enable Test Builds" ON)

0 commit comments

Comments
 (0)