diff --git a/workstation-setup/src/CMakeLists.txt b/workstation-setup/src/CMakeLists.txt index 0e1624f..c781300 100644 --- a/workstation-setup/src/CMakeLists.txt +++ b/workstation-setup/src/CMakeLists.txt @@ -25,6 +25,16 @@ target_link_libraries(nixos-workstations-setup Qt6::QuickControls2 ) +if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") + target_compile_options(nixos-workstations-setup + PRIVATE + -Wall + -Wextra + -Wpedantic + -Werror=reorder + ) +endif() + install( TARGETS nixos-workstations-setup RUNTIME DESTINATION bin diff --git a/workstation-setup/src/main.cpp b/workstation-setup/src/main.cpp index 52de545..073f6bc 100644 --- a/workstation-setup/src/main.cpp +++ b/workstation-setup/src/main.cpp @@ -41,7 +41,7 @@ int main(int argc, char *argv[]) QGuiApplication::setOrganizationName(QStringLiteral("Raspot")); QGuiApplication::setOrganizationDomain(QStringLiteral("raspot.in")); QGuiApplication::setApplicationName(QStringLiteral("NixOS Workstations Setup")); - QGuiApplication::setApplicationVersion(QStringLiteral("1.1.0")); + QGuiApplication::setApplicationVersion(QStringLiteral("1.2.0")); QGuiApplication::setDesktopFileName(QStringLiteral("org.raspot.nixosworkstations.setup")); QCommandLineParser parser; @@ -79,9 +79,11 @@ int main(int argc, char *argv[]) ProvisioningBackend provisioning(targetUser); if (parser.isSet(diagnoseOption)) { - qInfo().noquote() << "version=1.1.0"; + qInfo().noquote() << "version=1.2.0"; qInfo().noquote() << "current_user=" + provisioning.currentUser(); qInfo().noquote() << "target_user=" + provisioning.targetUser(); + qInfo().noquote() << "current_user_utf8_hex=" + QString::fromLatin1(provisioning.currentUser().toUtf8().toHex()); + qInfo().noquote() << "target_user_utf8_hex=" + QString::fromLatin1(provisioning.targetUser().toUtf8().toHex()); qInfo().noquote() << "authorized=" + (provisioning.authorizedUser() ? QStringLiteral("yes") : QStringLiteral("no")); qInfo().noquote() << "state_dir=" + provisioning.stateDirectory(); qInfo().noquote() << "password_marker=" + provisioning.passwordMarker();