Squashed 'cmake/cable/' changes from 311c059..3e54f97

3e54f97 Cable 0.2.14: Fix a spelling typo
c528da4 README: Add information how to update git subtree

git-subtree-dir: cmake/cable
git-subtree-split: 3e54f9751f50a3b6265c22402dcd5ae85ef701d4
This commit is contained in:
Paweł Bylica 2018-10-05 16:05:42 +02:00
parent 807549c77d
commit d0006cf91b
2 changed files with 13 additions and 4 deletions

View File

@ -20,6 +20,8 @@ independent and it is easy to use them individually.
## Install ## Install
The suggested Cable location is `cmake/cable` relative to your project root directory.
### As git subtree ### As git subtree
Adding a dependency project as a [git subtree] is just a copy of the source code Adding a dependency project as a [git subtree] is just a copy of the source code
@ -28,15 +30,22 @@ done in a bit more systematic way.
If you are not familiar with managing dependencies with git subtree read the If you are not familiar with managing dependencies with git subtree read the
[Git subtree: the alternative to Git submodule][git subtree tutorial]. [Git subtree: the alternative to Git submodule][git subtree tutorial].
#### To install
```sh ```sh
git remote add cable https://github.com/ethereum/cable git remote add cable https://github.com/ethereum/cable
git subtree add --prefix cmake/cable cable master --squash git subtree add --prefix cmake/cable cable master --squash
``` ```
#### To update
```sh
git subtree pull --prefix cmake/cable cable master --squash
```
### As git submodule ### As git submodule
Include the Cable library as [git submodule] in your project. The suggested Include the Cable library as [git submodule] in your project.
submodule location is `cmake/cable` relative to your project root directory.
```sh ```sh
git submodule add https://github.com/ethereum/cable cmake/cable git submodule add https://github.com/ethereum/cable cmake/cable

View File

@ -2,7 +2,7 @@
# Copyright 2018 Pawel Bylica. # Copyright 2018 Pawel Bylica.
# Licensed under the Apache License, Version 2.0. See the LICENSE file. # Licensed under the Apache License, Version 2.0. See the LICENSE file.
# Bootstrap the Cable - CMake Boostrap Library by including this file. # Bootstrap the Cable - CMake Bootstrap Library by including this file.
# e.g. include(cmake/cable/bootstrap.cmake). # e.g. include(cmake/cable/bootstrap.cmake).
@ -10,7 +10,7 @@
# #
# This is internal variable automatically updated with external tools. # This is internal variable automatically updated with external tools.
# Use CABLE_VERSION variable if you need this information. # Use CABLE_VERSION variable if you need this information.
set(version 0.2.13) set(version 0.2.14)
# For convenience, add the project CMake module dir to module path. # For convenience, add the project CMake module dir to module path.
set(module_dir ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(module_dir ${CMAKE_CURRENT_SOURCE_DIR}/cmake)