Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ApplicationCore
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ChimeraTK Mirror
ApplicationCore
Commits
ad087cb5
Commit
ad087cb5
authored
6 years ago
by
Martin Christoph Hierholzer
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of github.com:ChimeraTK/ApplicationCore
parents
5af2c6dc
a8bafe00
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
Modules/include/Logging.h
+2
-0
2 additions, 0 deletions
Modules/include/Logging.h
with
3 additions
and
1 deletion
CMakeLists.txt
+
1
−
1
View file @
ad087cb5
...
...
@@ -6,7 +6,7 @@ include(cmake/add_dependency.cmake)
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake/Modules
)
set
(
${
PROJECT_NAME
}
_MAJOR_VERSION 01
)
set
(
${
PROJECT_NAME
}
_MINOR_VERSION 0
0
)
set
(
${
PROJECT_NAME
}
_MINOR_VERSION 0
1
)
set
(
${
PROJECT_NAME
}
_PATCH_VERSION 00
)
include
(
cmake/set_version_numbers.cmake
)
...
...
This diff is collapsed.
Click to expand it.
Modules/include/Logging.h
+
2
−
0
View file @
ad087cb5
...
...
@@ -87,6 +87,8 @@
#undef GENERATE_XML
#include
"ApplicationCore.h"
#include
<queue>
#include
<map>
#include
<fstream>
namespace
ctk
=
ChimeraTK
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment