IAP GITLAB
Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
C
corsika
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
123
Issues
123
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Air Shower Physics
corsika
Commits
492c9456
Commit
492c9456
authored
Feb 28, 2021
by
Lukas Nellen
👣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Detect SCL compiler, deal with old ABI
parent
c6e6ac5c
Pipeline
#3558
passed with stages
in 14 minutes and 10 seconds
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
2 deletions
+17
-2
CMakeLists.txt
CMakeLists.txt
+4
-0
cmake/CorsikaDefines.cmake
cmake/CorsikaDefines.cmake
+7
-2
corsika/detail/framework/core/Logging.inl
corsika/detail/framework/core/Logging.inl
+6
-0
No files found.
CMakeLists.txt
View file @
492c9456
...
...
@@ -80,6 +80,9 @@ set (CMAKE_CXX_EXTENSIONS OFF)
# FYI: optimizer flags: -O2 would not trade speed for size, neither O2/3 use fast-math
# debug: O0, relwithdebinfo: 02, release: O3, minsizerel: Os (all defaults)
set
(
CMAKE_CXX_FLAGS
"-Wall -pedantic -Wextra -Wno-ignored-qualifiers"
)
if
(
CORSIKA_SCL_CXX
)
add_definitions
(
-D_GLIBCXX_USE_CXX11_ABI=0
)
endif
()
set
(
DEFAULT_BUILD_TYPE
"Release"
)
# clang produces a lot of unecessary warnings without this:
...
...
@@ -126,6 +129,7 @@ endif (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
#+++++++++++++++++++++++++++++
# Setup external dependencies.
#
###
include
(
conan
)
# self-provided in 'cmake' directory
#
# download and build all dependencies
...
...
cmake/CorsikaDefines.cmake
View file @
492c9456
...
...
@@ -14,10 +14,15 @@ endif ()
#
if
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Windows"
)
set
(
CORSIKA_OS_WINDOWS TRUE
)
set
(
CORSIKA_OS
"Windows"
)
set
(
CORSIKA_OS
"Windows"
)
elseif
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Linux"
)
set
(
CORSIKA_OS_LINUX TRUE
)
set
(
CORSIKA_OS
"Linux"
)
set
(
CORSIKA_OS
"Linux"
)
# check for RedHat/CentOS compiler from the software collections (scl)
string
(
FIND
${
CMAKE_CXX_COMPILER
}
"/opt/rh/devtoolset-"
index
)
if
(
${
index
}
EQUAL 0
)
set
(
CORSIKA_SCL_CXX TRUE
)
endif
()
elseif
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Darwin"
)
set
(
CORSIKA_OS_MAC TRUE
)
set
(
CORSIKA_OS
"Mac"
)
...
...
corsika/detail/framework/core/Logging.inl
View file @
492c9456
...
...
@@ -47,7 +47,13 @@ namespace corsika {
auto logger = spdlog::stdout_color_mt(name);
// set the default C8 format
#if (!defined(_GLIBCXX_USE_CXX11_ABI) || _GLIBCXX_USE_CXX11_ABI == 1)
logger->set_pattern(logging::default_pattern);
#else
// special case: gcc from the software collections devtoolset
std::string dp(default_pattern);
logger->set_pattern(dp);
#endif
// if defaultlog is True, we set this as the default spdlog logger.
if (defaultlog) { spdlog::set_default_logger(logger); }
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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