diff options
| author | Shatur95 <genaloner@gmail.com> | 2020-10-24 13:42:20 +0300 |
|---|---|---|
| committer | Shatur95 <genaloner@gmail.com> | 2020-10-24 14:20:37 +0300 |
| commit | 6c97f3e80de9c78b322617b8558bc34e978e29b9 (patch) | |
| tree | 1665054400b6643fd938a2b3502f1c9e2f849e77 | |
| parent | Merge pull request #118 from Shatur95/improve-qt6-support (diff) | |
| download | singleapplication-6c97f3e80de9c78b322617b8558bc34e978e29b9.tar.xz | |
Add Qt6 configuration
| -rw-r--r-- | .github/workflows/build-cmake.yml | 13 | ||||
| -rw-r--r-- | examples/basic/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | examples/calculator/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | examples/sending_arguments/CMakeLists.txt | 5 |
4 files changed, 15 insertions, 11 deletions
diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml index 82a432c..f550758 100644 --- a/.github/workflows/build-cmake.yml +++ b/.github/workflows/build-cmake.yml @@ -7,8 +7,11 @@ jobs: strategy: matrix: - qt_version: [5.12.6, 5.13.2, 5.14.0, 5.15.0] + qt_version: [5.12.6, 5.13.2, 5.14.0, 5.15.0, 6.0.0] platform: [ubuntu-latest, windows-latest, macos-latest] + include: + - qt_version: 6.0.0 + additional_arguments: -D QT_DEFAULT_MAJOR_VERSION=6 runs-on: ${{ matrix.platform }} @@ -21,7 +24,7 @@ jobs: version: ${{ matrix.qt_version }} - name: cmake - run: cmake . + run: cmake . ${{ matrix.additional_arguments }} - name: cmake build run: cmake --build . @@ -29,17 +32,17 @@ jobs: - name: Build example - basic (cmake) working-directory: examples/basic/ run: | - cmake . + cmake . ${{ matrix.additional_arguments }} cmake --build . - name: Build example - calculator (cmake) working-directory: examples/calculator/ run: | - cmake . + cmake . ${{ matrix.additional_arguments }} cmake --build . - name: Build example - sending_arguments (cmake) working-directory: examples/sending_arguments/ run: | - cmake . + cmake . ${{ matrix.additional_arguments }} cmake --build . diff --git a/examples/basic/CMakeLists.txt b/examples/basic/CMakeLists.txt index 49be29c..c142923 100644 --- a/examples/basic/CMakeLists.txt +++ b/examples/basic/CMakeLists.txt @@ -4,10 +4,9 @@ project(basic LANGUAGES CXX) # SingleApplication base class set(QAPPLICATION_CLASS QCoreApplication) +add_subdirectory(../.. SingleApplication) add_executable(basic main.cpp) -find_package(Qt5 COMPONENTS Core REQUIRED) -add_subdirectory(../.. SingleApplication) target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication) diff --git a/examples/calculator/CMakeLists.txt b/examples/calculator/CMakeLists.txt index 990bff5..82305f0 100644 --- a/examples/calculator/CMakeLists.txt +++ b/examples/calculator/CMakeLists.txt @@ -6,6 +6,9 @@ set(CMAKE_AUTOMOC ON) # SingleApplication base class set(QAPPLICATION_CLASS QApplication) +add_subdirectory(../.. SingleApplication) + +find_package(Qt${QT_DEFAULT_MAJOR_VERSION} COMPONENTS Core REQUIRED) add_executable(${PROJECT_NAME} button.h @@ -15,6 +18,4 @@ add_executable(${PROJECT_NAME} main.cpp ) -find_package(Qt5 COMPONENTS Widgets REQUIRED) -add_subdirectory(../.. SingleApplication) target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication) diff --git a/examples/sending_arguments/CMakeLists.txt b/examples/sending_arguments/CMakeLists.txt index 06c740f..2cc5597 100644 --- a/examples/sending_arguments/CMakeLists.txt +++ b/examples/sending_arguments/CMakeLists.txt @@ -6,6 +6,9 @@ set(CMAKE_AUTOMOC ON) # SingleApplication base class set(QAPPLICATION_CLASS QCoreApplication) +add_subdirectory(../.. SingleApplication) + +find_package(Qt${QT_DEFAULT_MAJOR_VERSION} COMPONENTS Core REQUIRED) add_executable(${PROJECT_NAME} main.cpp @@ -14,6 +17,4 @@ add_executable(${PROJECT_NAME} main.cpp ) -find_package(Qt5 COMPONENTS Core REQUIRED) -add_subdirectory(../.. SingleApplication) target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication) |