Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gsauthof-utility
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
external
gsauthof-utility
Commits
1735019e
Commit
1735019e
authored
6 years ago
by
Georg Sauthoff
Browse files
Options
Downloads
Patches
Plain Diff
maintain warning flags in environment variables
instead of CMakeLists.txt
parent
f84ff0d6
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+0
-7
0 additions, 7 deletions
CMakeLists.txt
ci/docker/build.sh
+27
-0
27 additions, 0 deletions
ci/docker/build.sh
with
27 additions
and
7 deletions
CMakeLists.txt
+
0
−
7
View file @
1735019e
...
@@ -14,14 +14,7 @@ configure_file(config.h.in config.h)
...
@@ -14,14 +14,7 @@ configure_file(config.h.in config.h)
# guard from super-projects, i.e. when it is added as subdirectory
# guard from super-projects, i.e. when it is added as subdirectory
IF
(
CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR
)
IF
(
CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR
)
# Remove existing -Wall in debug flags because we unconditionally supply
# -Wall and we don't want a trailing -Wall re-enable the silenced
# warnings
string
(
REPLACE
"-Wall"
""
CMAKE_CXX_FLAGS_DEBUG
${
CMAKE_CXX_FLAGS_DEBUG
}
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++1y"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++1y"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wall -Wno-missing-braces"
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-Wall -Wno-missing-braces"
)
add_subdirectory
(
libixxx
)
add_subdirectory
(
libixxx
)
add_subdirectory
(
libixxxutil
)
add_subdirectory
(
libixxxutil
)
...
...
This diff is collapsed.
Click to expand it.
ci/docker/build.sh
+
27
−
0
View file @
1735019e
...
@@ -2,6 +2,33 @@
...
@@ -2,6 +2,33 @@
set
-ex
set
-ex
CFLAGS
=
"-Wall -Wextra -Wno-missing-field-initializers
\
-Wno-parentheses -Wno-missing-braces
\
-Wmissing-prototypes -Wfloat-equal
\
-Wwrite-strings -Wpointer-arith -Wcast-align
\
-Wnull-dereference
\
-Werror=multichar -Werror=sizeof-pointer-memaccess -Werror=return-type
\
-fstrict-aliasing"
if
[
"
$CMAKE_BUILD_TYPE
"
=
Release
]
;
then
CFLAGS
=
"-Og
$CFLAGS
"
fi
export
CFLAGS
CXXFLAGS
=
"-Wall -Wextra -Wno-missing-field-initializers
\
-Wno-parentheses -Wno-missing-braces
\
-Wno-unused-local-typedefs
\
-Wfloat-equal
\
-Wpointer-arith -Wcast-align
\
-Wnull-dereference
\
-Wnon-virtual-dtor -Wmissing-declarations
\
-Werror=multichar -Werror=sizeof-pointer-memaccess -Werror=return-type
\
-Werror=delete-non-virtual-dtor
\
-fstrict-aliasing"
if
[
"
$CMAKE_BUILD_TYPE
"
=
Release
]
;
then
CXXFLAGS
=
"-Og
$CXXFLAGS
"
fi
export
CXXFLAGS
cd
/srv/build
cd
/srv/build
cmake
-G
Ninja
-DCMAKE_BUILD_TYPE
=
"
$CMAKE_BUILD_TYPE
"
/srv/src
cmake
-G
Ninja
-DCMAKE_BUILD_TYPE
=
"
$CMAKE_BUILD_TYPE
"
/srv/src
...
...
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