Skip to content

Commit

Permalink
fix RC file and system deps
Browse files Browse the repository at this point in the history
Signed-off-by: swurl <[email protected]>
  • Loading branch information
crueter committed Dec 25, 2024
1 parent 7924621 commit 477fe29
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 6 deletions.
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@ set(Dashboard_GIT_REPO https://github.com/${Dashboard_ORG_NAME}/${Dashboard_EXEC
project(QFRCDashboard VERSION 0.1 LANGUAGES CXX)

set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_AUTORCC ON)

option(USE_SYSTEM_NTCORE OFF "Use the system NTCore (Linux only)")
option(USE_SYSTEM_PROTOBUF OFF "Use the system protobuf (Linux only)")

find_package(Qt6 6.7 REQUIRED COMPONENTS Quick Multimedia)
add_subdirectory(3rd_party EXCLUDE_FROM_ALL)

Expand Down Expand Up @@ -61,6 +65,7 @@ set(QRC_FILES
qt_add_executable(${Dashboard_EXEC_NAME}
main.cpp
${QRC_FILES}
${RCS_FILE}
)

set_source_files_properties(Constants.qml
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ cmake --install build --prefix ${PKGDIR}
### Submodules
If you don't want to install protobuf and ntcore to your system, CMake options are provided for such:

- `USE_SYSTEM_NTCORE` (default ON)
- `USE_SYSTEM_PROTOBUF` (default ON)
- `USE_SYSTEM_NTCORE` (default OFF)
- `USE_SYSTEM_PROTOBUF` (default OFF)

Examples:

Expand Down
24 changes: 20 additions & 4 deletions program_info/QFRCDashboard-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 477fe29

Please sign in to comment.