Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review 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
mantidproject
mantid
Commits
140d2c16
Commit
140d2c16
authored
7 years ago
by
Hahn, Steven
Browse files
Options
Downloads
Patches
Plain Diff
Some ParaView macros don't play nicely with -Wpedantic.
parent
492a6745
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Vates/ParaviewPlugins/CMakeLists.txt
+3
-0
3 additions, 0 deletions
Vates/ParaviewPlugins/CMakeLists.txt
buildconfig/CMake/GNUSetup.cmake
+3
-9
3 additions, 9 deletions
buildconfig/CMake/GNUSetup.cmake
with
6 additions
and
9 deletions
Vates/ParaviewPlugins/CMakeLists.txt
+
3
−
0
View file @
140d2c16
# bring in Mantid/VATES API dependencies
set_mantid_subprojects
(
Vates/VatesAPI
)
# vtktypemacro doesn't play nicely with -Wpedantic
string
(
REPLACE
"-Wpedantic"
""
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
# NonOrthogonalSourcePlugin is necessary for viewing materials with nonorthogonal basis vectors.
# Copy it over to the pvplugins dir
if
(
"
${
CMAKE_CFG_INTDIR
}
"
STREQUAL
"."
)
...
...
This diff is collapsed.
Click to expand it.
buildconfig/CMake/GNUSetup.cmake
+
3
−
9
View file @
140d2c16
...
...
@@ -37,16 +37,10 @@ set( GNUFLAGS "-Wall -Wextra -Wconversion -Winit-self -Wpointer-arith -Wcast-qua
# -Wno-deprecated: Do not warn about use of deprecated headers.
# -Wno-write-strings: Do not warn about deprecated conversions of char*->const char*
# -Wno-unused-result: Do not warn about unused return values in some C functions
set
(
GNUFLAGS
"
${
GNUFLAGS
}
-Wno-deprecated -Wno-write-strings"
)
set
(
GNUFLAGS
"
${
GNUFLAGS
}
-Wno-deprecated -Wno-write-strings
-Wno-unused-result -Wpedantic
"
)
# Check if we have a new enough version for this flag
# some -pedantic warnings remain with gcc 4.4.7
if
(
CMAKE_COMPILER_IS_GNUCXX
)
if
(
NOT
(
GCC_COMPILER_VERSION VERSION_LESS
"4.5"
))
set
(
GNUFLAGS
"
${
GNUFLAGS
}
-Wno-unused-result -pedantic"
)
endif
()
elseif
(
"
${
CMAKE_CXX_COMPILER_ID
}
"
MATCHES
"Clang"
)
set
(
GNUFLAGS
"
${
GNUFLAGS
}
-Wno-sign-conversion"
)
if
(
"
${
CMAKE_CXX_COMPILER_ID
}
"
MATCHES
"Clang"
)
set
(
GNUFLAGS
"
${
GNUFLAGS
}
-Wno-sign-conversion"
)
endif
()
# Check if we have a new enough version for these flags
...
...
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