diff --git a/CMakeLists.txt b/CMakeLists.txt index 34a653a..47bfe15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,21 +9,18 @@ set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -find_package(QT NAMES Qt6 REQUIRED COMPONENTS Widgets LinguistTools) -find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets LinguistTools) - -#set(TS_FILES languages/Blackjack_en_GB.ts) +find_package(QT NAMES Qt6 REQUIRED COMPONENTS Widgets) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets) set(PROJECT_SOURCES - main.cpp - mainwindow.cpp - mainwindow.hpp - mainwindow.ui - playwindow.cpp - playwindow.hpp - playwindow.ui - images.qrc - ${TS_FILES} + main.cpp + mainwindow.cpp + mainwindow.hpp + mainwindow.ui + playwindow.cpp + playwindow.hpp + playwindow.ui + images.qrc ) add_subdirectory(blackjack) @@ -37,8 +34,6 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) # set_property(TARGET Blackjack APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR # ${CMAKE_CURRENT_SOURCE_DIR}/android) # For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation - - qt_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES}) else() if(ANDROID) add_library(Blackjack SHARED @@ -51,8 +46,6 @@ else() ${PROJECT_SOURCES} ) endif() - - qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES}) endif() target_compile_options(Blackjack PRIVATE $<$: diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user index 817bc4f..357ab9b 100644 --- a/CMakeLists.txt.user +++ b/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -76,9 +76,8 @@ true Builtin.DefaultTidyAndClazy 4 - - /home/sanderspeetjens/git/blackjack/Blackjack/CMakeLists.txt - + false + true @@ -89,26 +88,27 @@ ProjectExplorer.Project.Target.0 Desktop - Desktop Qt 6.5.0 GCC 64bit - Desktop Qt 6.5.0 GCC 64bit - qt.qt6.650.gcc_64_kit - 4 + Replacement for "Desktop Qt 6.5.1 GCC 64bit" + Replacement for "Desktop Qt 6.5.1 GCC 64bit" + qt.qt6.651.gcc_64_kit + 0 0 0 - Release + Debug 2 false -DCMAKE_GENERATOR:STRING=Ninja --DCMAKE_BUILD_TYPE:STRING=Release +-DCMAKE_BUILD_TYPE:STRING=Debug -DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{buildDir}/.qtc/package-manager/auto-setup.cmake -DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable} -DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX} -DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C} -DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx} -DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG} - /home/sanderspeetjens/git/blackjack/build-Blackjack-Desktop_Qt_6_5_0_GCC_64bit-Release + 0 + /home/sanderspeetjens/git/build-Desktop_Qt_6_5_1_GCC_64bit-Debug @@ -148,10 +148,64 @@ false - Release + Debug CMakeProjectManager.CMakeBuildConfiguration + Release + 2 + false + + -DCMAKE_GENERATOR:STRING=Ninja +-DCMAKE_BUILD_TYPE:STRING=Release +-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{buildDir}/.qtc/package-manager/auto-setup.cmake +-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable} +-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX} +-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C} +-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx} +-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG} + /home/sanderspeetjens/git/Blackjack/build-Desktop_Qt_6_5_1_GCC_64bit-Release + + + + + all + + false + + true + CMakeProjectManager.MakeStep + + 1 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + + + clean + + false + + true + CMakeProjectManager.MakeStep + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Release + CMakeProjectManager.CMakeBuildConfiguration + + RelWithDebInfo 2 false @@ -164,7 +218,7 @@ -DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C} -DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx} -DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG} - /home/sanderspeetjens/git/blackjack/build-Blackjack-Desktop_Qt_6_5_0_GCC_64bit-RelWithDebInfo + /home/sanderspeetjens/git/Blackjack/build-Desktop_Qt_6_5_1_GCC_64bit-RelWithDebInfo @@ -205,7 +259,7 @@ Release with Debug Information CMakeProjectManager.CMakeBuildConfiguration - + RelWithDebInfo 2 false @@ -219,7 +273,7 @@ -DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx} -DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG} 0 - /home/sanderspeetjens/git/blackjack/build-Blackjack-Desktop_Qt_6_5_0_GCC_64bit-Profile + /home/sanderspeetjens/git/Blackjack/build-Desktop_Qt_6_5_1_GCC_64bit-Profile @@ -260,7 +314,7 @@ Profile CMakeProjectManager.CMakeBuildConfiguration - + MinSizeRel 2 false @@ -273,7 +327,7 @@ -DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C} -DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx} -DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG} - /home/sanderspeetjens/git/blackjack/build-Blackjack-Desktop_Qt_6_5_0_GCC_64bit-MinSizeRel + /home/sanderspeetjens/git/Blackjack/build-Desktop_Qt_6_5_1_GCC_64bit-MinSizeRel @@ -283,7 +337,6 @@ false true - Build CMakeProjectManager.MakeStep 1 @@ -300,7 +353,6 @@ false true - Build CMakeProjectManager.MakeStep 1 @@ -316,63 +368,6 @@ Minimum Size Release CMakeProjectManager.CMakeBuildConfiguration - - Debug - 2 - false - - -DCMAKE_GENERATOR:STRING=Ninja --DCMAKE_BUILD_TYPE:STRING=Debug --DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{buildDir}/.qtc/package-manager/auto-setup.cmake --DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx} --DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG} - 0 - /home/sanderspeetjens/git/build-Blackjack-Desktop_Qt_6_5_0_GCC_64bit-Debug - - - - - all - - false - - true - Build - CMakeProjectManager.MakeStep - - 1 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - - - clean - - false - - true - Build - CMakeProjectManager.MakeStep - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - true - - Debug - CMakeProjectManager.CMakeBuildConfiguration - 5 @@ -394,15 +389,14 @@ 2 + false Blackjack CMakeProjectManager.CMakeRunConfiguration.Blackjack Blackjack - false true true - false true - /home/sanderspeetjens/git/build-Blackjack-Desktop_Qt_6_5_0_GCC_64bit-Debug + /home/sanderspeetjens/git/build-Desktop_Qt_6_5_1_GCC_64bit-Debug 1 diff --git a/blackjack/CMakeLists.txt b/blackjack/CMakeLists.txt index 1a6cd83..b440d2a 100644 --- a/blackjack/CMakeLists.txt +++ b/blackjack/CMakeLists.txt @@ -15,4 +15,4 @@ target_include_directories(blackjack target_compile_options(blackjack PRIVATE $<$: -Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion -g - >) \ No newline at end of file + >)