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
d54225b8
Commit
d54225b8
authored
5 years ago
by
Automated MSK Jenkins User
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'project-template/master'
parents
7fca0a2b
d55cfe6a
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
cmake/set_default_build_to_release.cmake
+1
-1
1 addition, 1 deletion
cmake/set_default_build_to_release.cmake
cmake/set_default_flags.cmake
+28
-0
28 additions, 0 deletions
cmake/set_default_flags.cmake
with
29 additions
and
1 deletion
cmake/set_default_build_to_release.cmake
+
1
−
1
View file @
d54225b8
...
...
@@ -16,7 +16,7 @@
######################################################################################################################
if
(
NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL
"None"
)
set
(
CMAKE_BUILD_TYPE
"Rel
ease
"
CACHE STRING
set
(
CMAKE_BUILD_TYPE
"Rel
WithDebInfo
"
CACHE STRING
"Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel."
FORCE
)
endif
(
NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL
"None"
)
...
...
This diff is collapsed.
Click to expand it.
cmake/
enable_cxx11_support
.cmake
→
cmake/
set_default_flags
.cmake
+
28
−
0
View file @
d54225b8
#######################################################################################################################
#
enable_cxx11_support
.cmake
#
set_default_flags
.cmake
#
# NOTE: Do not use this routine! Use enable_latest_css_support.cmake instead, even if you only need C++11, as the
# compiler always uses the strictest ("oldest") specified standard if mulitple flags are given. This will create
# problems when combining multiple projects (libraries...) requiring different C++ standards.
# Set default compiler flags for C++, including the flags for thelatest C++ standard (see
# enable_latest_cxx_support.cmake)
#
# Enable C++-11 support by selecting the appropriate compiler flag. The flag will be appended to all of the following
# cmake variables:
# - CMAKE_CXX_FLAGS
# - ${PROJECT_NAME}_CXX_FLAGS
# - ${PROJECT_NAME}_CMAKE_CXX_FLAGS
# It will also append ${PROJECT_NAME}_CXX_FLAGS to the CMAKE_CXX_FLAGS, so it is a good idea to set any project
# specific flags before calling this macro.
#
#######################################################################################################################
...
...
@@ -25,17 +21,8 @@
#
#######################################################################################################################
include
(
CheckCXXCompilerFlag
)
CHECK_CXX_COMPILER_FLAG
(
"-std=c++11"
COMPILER_SUPPORTS_CXX11
)
CHECK_CXX_COMPILER_FLAG
(
"-std=c++0x"
COMPILER_SUPPORTS_CXX0X
)
if
(
COMPILER_SUPPORTS_CXX11
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++11"
)
set
(
${
PROJECT_NAME
}
_CXX_FLAGS
"
${${
PROJECT_NAME
}
_CXX_FLAGS
}
-std=c++11"
)
set
(
${
PROJECT_NAME
}
_CMAKE_CXX_FLAGS
"
${${
PROJECT_NAME
}
_CMAKE_CXX_FLAGS
}
-std=c++11"
)
elseif
(
COMPILER_SUPPORTS_CXX0X
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++0x"
)
set
(
${
PROJECT_NAME
}
_CXX_FLAGS
"
${${
PROJECT_NAME
}
_CXX_FLAGS
}
-std=c++0x"
)
set
(
${
PROJECT_NAME
}
_CMAKE_CXX_FLAGS
"
${${
PROJECT_NAME
}
_CMAKE_CXX_FLAGS
}
-std=c++0x"
)
else
()
message
(
STATUS
"The compiler
${
CMAKE_CXX_COMPILER
}
has no C++11 support. Please use a different C++ compiler."
)
endif
()
include
(
cmake/enable_latest_cxx_support.cmake
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
${${
PROJECT_NAME
}
_CXX_FLAGS
}
-Wall -Wextra -Wshadow -pedantic -Wuninitialized"
)
set
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-O0 --coverage"
)
set
(
CMAKE_CXX_FLAGS_RELEASE
"
${
CMAKE_CXX_FLAGS_RELEASE
}
-O3"
)
set
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"
${
CMAKE_CXX_FLAGS_RELWITHDEBINFO
}
-O3 -g"
)
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