diff --git a/CMakeLists.txt b/CMakeLists.txt index 752da522..1b8dfce1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) @@ -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 diff --git a/README.md b/README.md index 7fd1fc4e..742c98df 100644 --- a/README.md +++ b/README.md @@ -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: diff --git a/program_info/QFRCDashboard-symbolic.svg b/program_info/QFRCDashboard-symbolic.svg index e7044f76..c26c60bb 100644 --- a/program_info/QFRCDashboard-symbolic.svg +++ b/program_info/QFRCDashboard-symbolic.svg @@ -1,6 +1,22 @@ - - - - + + + + + + + + + + + + + + + + + + + +