Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
Dmitri Naumov
ogs
Commits
b64ba652
Commit
b64ba652
authored
9 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
Suppress false positive warnings on all platforms on ccache.
parent
d5a01bd4
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
scripts/cmake/CompilerSetup.cmake
+4
-9
4 additions, 9 deletions
scripts/cmake/CompilerSetup.cmake
scripts/cmake/Find.cmake
+10
-7
10 additions, 7 deletions
scripts/cmake/Find.cmake
with
14 additions
and
16 deletions
scripts/cmake/CompilerSetup.cmake
+
4
−
9
View file @
b64ba652
...
@@ -8,13 +8,13 @@ set(CMAKE_OSX_ARCHITECTURES "x86_64")
...
@@ -8,13 +8,13 @@ set(CMAKE_OSX_ARCHITECTURES "x86_64")
# Set compiler helper variables
# Set compiler helper variables
if
(
${
CMAKE_CXX_COMPILER_ID
}
MATCHES
"Clang"
)
if
(
${
CMAKE_CXX_COMPILER_ID
}
MATCHES
"Clang"
)
set
(
COMPILER_IS_CLANG TRUE
)
set
(
COMPILER_IS_CLANG TRUE
CACHE BOOL
""
INTERNAL
)
elseif
(
${
CMAKE_CXX_COMPILER_ID
}
STREQUAL
"GNU"
)
elseif
(
${
CMAKE_CXX_COMPILER_ID
}
STREQUAL
"GNU"
)
set
(
COMPILER_IS_GCC TRUE
)
set
(
COMPILER_IS_GCC TRUE
CACHE BOOL
""
INTERNAL
)
elseif
(
${
CMAKE_CXX_COMPILER_ID
}
STREQUAL
"Intel"
)
elseif
(
${
CMAKE_CXX_COMPILER_ID
}
STREQUAL
"Intel"
)
set
(
COMPILER_IS_INTEL TRUE
)
set
(
COMPILER_IS_INTEL TRUE
CACHE BOOL
""
INTERNAL
)
elseif
(
${
CMAKE_CXX_COMPILER_ID
}
STREQUAL
"MSVC"
)
elseif
(
${
CMAKE_CXX_COMPILER_ID
}
STREQUAL
"MSVC"
)
set
(
COMPILER_IS_MSVC TRUE
)
set
(
COMPILER_IS_MSVC TRUE
CACHE BOOL
""
INTERNAL
)
endif
()
# CMAKE_CXX_COMPILER_ID
endif
()
# CMAKE_CXX_COMPILER_ID
# Better Clang warning suppression, see http://www.openwalnut.org/issues/230
# Better Clang warning suppression, see http://www.openwalnut.org/issues/230
...
@@ -63,11 +63,6 @@ if(COMPILER_IS_CLANG)
...
@@ -63,11 +63,6 @@ if(COMPILER_IS_CLANG)
endif
()
endif
()
include
(
ClangSanitizer
)
include
(
ClangSanitizer
)
if
(
CCACHE_FOUND AND APPLE
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Qunused-arguments"
)
endif
()
endif
()
# COMPILER_IS_CLANG
endif
()
# COMPILER_IS_CLANG
### Intel compiler
### Intel compiler
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/Find.cmake
+
10
−
7
View file @
b64ba652
...
@@ -45,6 +45,16 @@ find_program(CURL_TOOL_PATH curl DOC "The curl-tool")
...
@@ -45,6 +45,16 @@ find_program(CURL_TOOL_PATH curl DOC "The curl-tool")
find_program
(
S3CMD_TOOL_PATH s3cmd DOC
"S3cmd tool for uploading to Amazon S3"
)
find_program
(
S3CMD_TOOL_PATH s3cmd DOC
"S3cmd tool for uploading to Amazon S3"
)
## CCache
find_program
(
CCACHE_FOUND ccache
)
if
(
CCACHE_FOUND
)
set_property
(
GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache
)
set_property
(
GLOBAL PROPERTY RULE_LAUNCH_LINK ccache
)
if
(
COMPILER_IS_CLANG
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Qunused-arguments"
)
endif
()
endif
(
CCACHE_FOUND
)
######################
######################
### Find libraries ###
### Find libraries ###
######################
######################
...
@@ -128,10 +138,3 @@ if(OGS_USE_MPI)
...
@@ -128,10 +138,3 @@ if(OGS_USE_MPI)
find_package
(
MPI REQUIRED
)
find_package
(
MPI REQUIRED
)
include_directories
(
SYSTEM
${
MPI_CXX_INCLUDE_PATH
}
)
include_directories
(
SYSTEM
${
MPI_CXX_INCLUDE_PATH
}
)
endif
()
endif
()
## CCache
find_program
(
CCACHE_FOUND ccache
)
if
(
CCACHE_FOUND
)
set_property
(
GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache
)
set_property
(
GLOBAL PROPERTY RULE_LAUNCH_LINK ccache
)
endif
(
CCACHE_FOUND
)
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