mirror of
https://github.com/simonbrunel/qtpromise.git
synced 2024-11-21 18:24:29 +08:00
Bump version to 0.7.0
This commit is contained in:
parent
ac9b936959
commit
f382ad25fc
@ -4,7 +4,7 @@ if(DEFINED PROJECT_NAME)
|
|||||||
set(SUBPROJECT ON)
|
set(SUBPROJECT ON)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
project(qtpromise VERSION 0.6.0 LANGUAGES CXX)
|
project(qtpromise VERSION 0.7.0 LANGUAGES CXX)
|
||||||
|
|
||||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
|
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
|
||||||
|
|
||||||
|
2
LICENSE
2
LICENSE
@ -1,6 +1,6 @@
|
|||||||
The MIT License (MIT)
|
The MIT License (MIT)
|
||||||
|
|
||||||
Copyright (c) 2017-2020 Simon Brunel, https://github.com/simonbrunel
|
Copyright (c) 2017-present Simon Brunel, https://github.com/simonbrunel
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
@ -28,7 +28,7 @@ installed either as a [`subtree`](#subtree) or a [`submodule`](#submodule). Read
|
|||||||
commands in ["Git: submodules vs subtrees"](https://nering.dev/2016/git-submodules-vs-subtrees/)
|
commands in ["Git: submodules vs subtrees"](https://nering.dev/2016/git-submodules-vs-subtrees/)
|
||||||
which provides a good comparison between these two workflows.
|
which provides a good comparison between these two workflows.
|
||||||
|
|
||||||
The following examples install QtPromise version 0.6.0 under the `3rdparty/qtpromise` subdirectory.
|
The following examples install QtPromise version 0.7.0 under the `3rdparty/qtpromise` subdirectory.
|
||||||
Note that the install directory is arbitrary and can be any empty directory under your repository.
|
Note that the install directory is arbitrary and can be any empty directory under your repository.
|
||||||
Once installed, refer to the [CMake](#cmake) or [qmake](#qmake) sections for details of integrating
|
Once installed, refer to the [CMake](#cmake) or [qmake](#qmake) sections for details of integrating
|
||||||
QtPromise into your project.
|
QtPromise into your project.
|
||||||
@ -38,7 +38,7 @@ QtPromise into your project.
|
|||||||
```sh
|
```sh
|
||||||
cd <your/project/repository>
|
cd <your/project/repository>
|
||||||
git remote add qtpromise https://github.com/simonbrunel/qtpromise.git
|
git remote add qtpromise https://github.com/simonbrunel/qtpromise.git
|
||||||
git subtree add -P 3rdparty/qtpromise qtpromise v0.6.0 --squash -m "Add QtPromise v0.6.0"
|
git subtree add -P 3rdparty/qtpromise qtpromise v0.7.0 --squash -m "Add QtPromise v0.7.0"
|
||||||
```
|
```
|
||||||
|
|
||||||
#### submodule
|
#### submodule
|
||||||
@ -47,10 +47,10 @@ git subtree add -P 3rdparty/qtpromise qtpromise v0.6.0 --squash -m "Add QtPromis
|
|||||||
cd <your/project/repository>
|
cd <your/project/repository>
|
||||||
git submodule add https://github.com/simonbrunel/qtpromise.git 3rdparty/qtpromise
|
git submodule add https://github.com/simonbrunel/qtpromise.git 3rdparty/qtpromise
|
||||||
cd 3rdparty/qtpromise
|
cd 3rdparty/qtpromise
|
||||||
git checkout v0.6.0
|
git checkout v0.7.0
|
||||||
cd ../..
|
cd ../..
|
||||||
git add 3rdparty/qtpromise
|
git add 3rdparty/qtpromise
|
||||||
git commit -m "Add QtPromise v0.6.0"
|
git commit -m "Add QtPromise v0.7.0"
|
||||||
```
|
```
|
||||||
|
|
||||||
### Download
|
### Download
|
||||||
@ -60,7 +60,7 @@ as a `zip` or `tar.gz` archive. Under Linux, you can use the following commands:
|
|||||||
|
|
||||||
```sh
|
```sh
|
||||||
cd <your/project/repository>
|
cd <your/project/repository>
|
||||||
wget -q -O qtpromise.tar.gz https://github.com/simonbrunel/qtpromise/archive/v0.5.0.tar.gz
|
wget -q -O qtpromise.tar.gz https://github.com/simonbrunel/qtpromise/archive/v0.7.0.tar.gz
|
||||||
tar xzf qtpromise.tar.gz --strip 1 --one-top-level=3rdparty/qtpromise
|
tar xzf qtpromise.tar.gz --strip 1 --one-top-level=3rdparty/qtpromise
|
||||||
rm qtpromise.tar.gz
|
rm qtpromise.tar.gz
|
||||||
```
|
```
|
||||||
@ -97,7 +97,7 @@ include(FetchContent)
|
|||||||
|
|
||||||
FetchContent_Declare(qtpromise
|
FetchContent_Declare(qtpromise
|
||||||
GIT_REPOSITORY https://github.com/simonbrunel/qtpromise.git
|
GIT_REPOSITORY https://github.com/simonbrunel/qtpromise.git
|
||||||
GIT_TAG v0.6.0
|
GIT_TAG v0.7.0
|
||||||
GIT_SHALLOW true
|
GIT_SHALLOW true
|
||||||
)
|
)
|
||||||
|
|
||||||
|
2
qpm.json
2
qpm.json
@ -10,7 +10,7 @@
|
|||||||
"url": "https://github.com/simonbrunel/qtpromise.git"
|
"url": "https://github.com/simonbrunel/qtpromise.git"
|
||||||
},
|
},
|
||||||
"version": {
|
"version": {
|
||||||
"label": "0.6.0"
|
"label": "0.7.0"
|
||||||
},
|
},
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"pri_filename": "qtpromise.pri",
|
"pri_filename": "qtpromise.pri",
|
||||||
|
Loading…
Reference in New Issue
Block a user