Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Corryvreckan
Corryvreckan
Commits
5eb4bb83
Commit
5eb4bb83
authored
Nov 10, 2017
by
Simon Spannagel
Browse files
Add welcome message
parent
690d5260
Pipeline
#235715
canceled with stages
in 2 minutes and 1 second
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
5eb4bb83
...
...
@@ -27,9 +27,6 @@ PROJECT(Corryvreckan VERSION ${SIMPLE_VERSION} LANGUAGES NONE)
# Access the project name (for install locations) in the source
ADD_DEFINITIONS
(
-DCORRYVRECKAN_PROJECT_NAME=
"
${
CMAKE_PROJECT_NAME
}
"
-DCORRYVRECKAN_PROJECT_VERSION=
"
${
CORRYVRECKAN_VERSION
}
"
)
# Include a generated configuration file
# FIXME: this should be combined with the ADD_DEFINITIONS
CONFIGURE_FILE
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake/config.cmake.h"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/config.h"
@ONLY
)
###############################
# Setup the build environment #
...
...
cmake/config.cmake.h
deleted
100644 → 0
View file @
690d5260
#pragma once
// CMake uses config.cmake.h to generate config.h within the build folder.
#ifndef CORRYVRECKAN_CONFIG_H
#define CORRYVRECKAN_CONFIG_H
#define PACKAGE_NAME "@CMAKE_PROJECT_NAME@"
#define PACKAGE_VERSION "@CORRYVRECKAN_LIB_VERSION@"
#define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION
#endif
src/core/Analysis.cpp
View file @
5eb4bb83
...
...
@@ -22,6 +22,11 @@ using namespace corryvreckan;
// Default constructor
Analysis
::
Analysis
(
std
::
string
config_file_name
,
std
::
vector
<
std
::
string
>
options
)
:
m_terminate
(
false
)
{
LOG
(
TRACE
)
<<
"Loading Corryvreckan"
;
// Put welcome message
LOG
(
STATUS
)
<<
"Welcome to Corryvreckan "
<<
CORRYVRECKAN_PROJECT_VERSION
;
// Load the global configuration
conf_mgr_
=
std
::
make_unique
<
corryvreckan
::
ConfigManager
>
(
std
::
move
(
config_file_name
));
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment