IAP GITLAB
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
corsika
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue 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
Pranav Sampathkumar
corsika
Commits
492c9456
Commit
492c9456
authored
4 years ago
by
Lukas Nellen
Browse files
Options
Downloads
Patches
Plain Diff
Detect SCL compiler, deal with old ABI
parent
c6e6ac5c
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+4
-0
4 additions, 0 deletions
CMakeLists.txt
cmake/CorsikaDefines.cmake
+7
-2
7 additions, 2 deletions
cmake/CorsikaDefines.cmake
corsika/detail/framework/core/Logging.inl
+6
-0
6 additions, 0 deletions
corsika/detail/framework/core/Logging.inl
with
17 additions
and
2 deletions
CMakeLists.txt
+
4
−
0
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
...
...
This diff is collapsed.
Click to expand it.
cmake/CorsikaDefines.cmake
+
7
−
2
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"
)
...
...
This diff is collapsed.
Click to expand it.
corsika/detail/framework/core/Logging.inl
+
6
−
0
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
);
}
...
...
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