Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
dynamic
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
MostafaMollaali
dynamic
Commits
5c199be8
Commit
5c199be8
authored
7 years ago
by
Dmitri Naumov
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #1950 from bilke/ccache-versions
Ccache versions
parents
86863c4e
bb0d3fd1
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/CCacheSetup.cmake
+13
-0
13 additions, 0 deletions
scripts/cmake/CCacheSetup.cmake
scripts/cmake/ConanSetup.cmake
+1
-2
1 addition, 2 deletions
scripts/cmake/ConanSetup.cmake
with
14 additions
and
2 deletions
scripts/cmake/CCacheSetup.cmake
+
13
−
0
View file @
5c199be8
...
...
@@ -2,6 +2,19 @@ if(NOT CCACHE_TOOL_PATH)
return
()
endif
()
# Check ccache version
set
(
CCACHE_VERSION_REQUIRED 3.2.0
)
execute_process
(
COMMAND
${
CCACHE_TOOL_PATH
}
--version
OUTPUT_VARIABLE CCACHE_VERSION
)
if
(
"
${
CCACHE_VERSION
}
"
MATCHES
"ccache version ([0-9]
\\
.[0-9]
\\
.[0-9])"
)
if
(
${
CMAKE_MATCH_1
}
VERSION_LESS
${
CCACHE_VERSION_REQUIRED
}
)
message
(
STATUS
"CCache outdated. Installed:
${
CMAKE_MATCH_1
}
, \
required:
${
CCACHE_VERSION_REQUIRED
}
. Caching disabled."
)
return
()
endif
()
endif
()
# Set ccache as the compiler launcher
set_property
(
GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache
)
set_property
(
GLOBAL PROPERTY RULE_LAUNCH_LINK ccache
)
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/ConanSetup.cmake
+
1
−
2
View file @
5c199be8
...
...
@@ -68,8 +68,7 @@ else()
endif
()
# Add conan-community remote
if
(
"
${
CONAN_REMOTES
}
"
MATCHES
"conan-community: \
https://api.bintray.com/conan/conan-community/conan"
)
if
(
"
${
CONAN_REMOTES
}
"
MATCHES
"conan-community: https://api.bintray.com/conan/conan-community/conan"
)
execute_process
(
COMMAND
${
CONAN_CMD
}
remote update -i 2 conan-community
https://api.bintray.com/conan/conan-community/conan
)
else
()
...
...
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