diff --git a/CMakeLists.txt b/CMakeLists.txt index 86a23a5..e25b22a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,41 +1,33 @@ cmake_minimum_required(VERSION 3.16) -project(testtaker LANGUAGES CXX) +project(TestTaker LANGUAGES CXX) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/designer/testtaker") - find_package(Qt6 REQUIRED COMPONENTS Core Gui UiTools Widgets) -qt_add_executable(testtaker main.cpp) +qt_add_executable(TestTaker main.cpp) -set_target_properties(testtaker PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE +set_target_properties(TestTaker PROPERTIES + WIN32_EXECUTABLE TRUE # Required for GUI executables + MACOSX_BUNDLE TRUE # Required for GUI executables to be launchable from Finder ) -#! [0] -target_link_libraries(testtaker PUBLIC +target_link_libraries(TestTaker PUBLIC Qt::Core Qt::Gui Qt::UiTools Qt::Widgets ) -#! [0] -qt6_add_resources(testtaker "testtaker" +qt6_add_resources(TestTaker "TestTaker" PREFIX "/forms" FILES - "calculatorform.ui" + "form.ui" ) -install(TARGETS testtaker +install(TARGETS TestTaker RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/calculatorform.ui b/form.ui similarity index 100% rename from calculatorform.ui rename to form.ui diff --git a/main.cpp b/main.cpp index a8202bf..eec8ae6 100644 --- a/main.cpp +++ b/main.cpp @@ -11,7 +11,7 @@ using namespace Qt::StringLiterals; static QWidget *loadCalculatorForm(QWidget *parent = nullptr) { - QFile file(u":/forms/calculatorform.ui"_s); + QFile file(u":/forms/form.ui"_s); if (!file.open(QFile::ReadOnly)) return nullptr;