Skip to content

Commit 44224a9

Browse files
authored
Merge pull request #20 from ZIMO-Elektronik/updates
Updates
2 parents dcc7324 + 5682cf7 commit 44224a9

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ on:
88

99
jobs:
1010
tests:
11-
uses: ZIMO-Elektronik/.github-workflows/.github/workflows/x86_64-linux-gnu-gcc.yml@v0.0.6
11+
uses: ZIMO-Elektronik/.github-workflows/.github/workflows/x86_64-linux-gnu-gcc.yml@v0.0.8
1212
with:
1313
pre-build: sudo apt install -y libgl1-mesa-dev libglx-dev ninja-build

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
## 0.9.2
4+
- Update to CPM 0.40.1
5+
36
## 0.9.1
47
- Bugfix don't build tests if [`CMAKE_CURRENT_SOURCE_DIR`](https://cmake.org/cmake/help/latest/variable/CMAKE_CURRENT_SOURCE_DIR.html) != [`CMAKE_SOURCE_DIR`](https://cmake.org/cmake/help/latest/variable/CMAKE_SOURCE_DIR.html)
58

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if(NOT cpm.cmake_SOURCE_DIR)
1515
FetchContent_Declare(
1616
CPM.cmake
1717
GIT_REPOSITORY "https://github.com/cpm-cmake/CPM.cmake.git"
18-
GIT_TAG v0.39.0)
18+
GIT_TAG v0.40.1)
1919
FetchContent_MakeAvailable(CPM.cmake)
2020
include(${cpm.cmake_SOURCE_DIR}/cmake/CPM.cmake)
2121
endif()

cmake/FindCQtDeployer.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2222
SOFTWARE.
2323
]]
2424

25-
# Default to version 1.6.2345
25+
# Default to version 1.6.2365
2626
if(CQtDeployer_FIND_VERSION_COMPLETE)
2727
set(VERSION ${CQtDeployer_FIND_VERSION_COMPLETE})
2828
else()
29-
set(VERSION 1.6.2345)
29+
set(VERSION 1.6.2365)
3030
endif()
3131

3232
# Default to HOST

0 commit comments

Comments
 (0)