Skip to content

Commit 043b637

Browse files
committed
Modernise CMake build
1 parent 9fef61b commit 043b637

File tree

18 files changed

+535
-81
lines changed

18 files changed

+535
-81
lines changed

.editorconfig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
root = true
2+
3+
[*]
4+
indent_style = tab
5+
tab_width = 4
6+
insert_final_newline = true
7+
8+
[{CMakeLists.txt,*.cmake}]
9+
indent_style = space
10+
11+
# Qt VS Tools always overrides this...
12+
[{CMakePresets.json,CMakeUserPresets.json}]
13+
indent_style = space
14+
indent_size = 2
15+
insert_final_newline = false

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ jobs:
3333
- name: Install Qt
3434
uses: jurplel/install-qt-action@v4
3535
with:
36-
version: 5.15.*
36+
version: 6.*
3737

3838
- name: Build
3939
shell: bash
4040
run: |
4141
if [ "$RUNNER_OS" == "Windows" ]; then
4242
export CMAKE_GENERATOR=Ninja
4343
fi
44-
cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_INSTALL_PREFIX=install -DLIBBNDL_BUILD_UI=ON
44+
cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_INSTALL_PREFIX=install -DLIBBNDL_BUILD_TOOLS=ON -DLIBBNDL_BUILD_UI=ON -DLIBBNDL_INSTALL_UI=ON
4545
cmake --build build
4646
cmake --install build
4747

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
.vscode
33
build
44
gcc_build
5+
out
6+
CMakeUserPresets.json

.gitmodules

Lines changed: 0 additions & 14 deletions
This file was deleted.

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
cmake_minimum_required(VERSION 3.1)
1+
cmake_minimum_required(VERSION 3.28 FATAL_ERROR)
22

33
project(libbndl CXX C)
44

55
set(LIBBNDL_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
66

77
add_subdirectory(src)
88

9-
option(LIBBNDL_BUILD_TOOLS "Build tools using libbndl" ON)
9+
option(LIBBNDL_BUILD_TOOLS "Build tools using libbndl" OFF)
1010
if(LIBBNDL_BUILD_TOOLS)
11-
add_subdirectory(tools)
11+
add_subdirectory(tools)
1212
endif()

0 commit comments

Comments
 (0)