Skip to content

Commit

Permalink
Merge pull request #20 from ZIMO-Elektronik/updates
Browse files Browse the repository at this point in the history
Updates
  • Loading branch information
higaski authored Jul 29, 2024
2 parents dcc7324 + 5682cf7 commit 44224a9
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ on:

jobs:
tests:
uses: ZIMO-Elektronik/.github-workflows/.github/workflows/[email protected].6
uses: ZIMO-Elektronik/.github-workflows/.github/workflows/[email protected].8
with:
pre-build: sudo apt install -y libgl1-mesa-dev libglx-dev ninja-build
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## 0.9.2
- Update to CPM 0.40.1

## 0.9.1
- 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)

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if(NOT cpm.cmake_SOURCE_DIR)
FetchContent_Declare(
CPM.cmake
GIT_REPOSITORY "https://github.com/cpm-cmake/CPM.cmake.git"
GIT_TAG v0.39.0)
GIT_TAG v0.40.1)
FetchContent_MakeAvailable(CPM.cmake)
include(${cpm.cmake_SOURCE_DIR}/cmake/CPM.cmake)
endif()
Expand Down
4 changes: 2 additions & 2 deletions cmake/FindCQtDeployer.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
]]

# Default to version 1.6.2345
# Default to version 1.6.2365
if(CQtDeployer_FIND_VERSION_COMPLETE)
set(VERSION ${CQtDeployer_FIND_VERSION_COMPLETE})
else()
set(VERSION 1.6.2345)
set(VERSION 1.6.2365)
endif()

# Default to HOST
Expand Down

0 comments on commit 44224a9

Please sign in to comment.