mirrors/SingleApplication
1
0
Fork 0
mirror of https://github.com/itay-grudev/SingleApplication.git synced 2024-11-15 12:15:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Qt6 configuration

Browse Source
This commit is contained in:
Shatur95 2020-10-24 13:42:20 +03:00
parent c6227ee2cd
commit 6c97f3e80d
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/build-cmake.yml vendored
View File

@ -7,8 +7,11 @@ jobs:
strategy: strategy:
matrix: 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] 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 }} runs-on: ${{ matrix.platform }}
@ -21,7 +24,7 @@ jobs:
version: ${{ matrix.qt_version }} version: ${{ matrix.qt_version }}
- name: cmake - name: cmake
run: cmake . run: cmake . ${{ matrix.additional_arguments }}
- name: cmake build - name: cmake build
run: cmake --build . run: cmake --build .
@ -29,17 +32,17 @@ jobs:
- name: Build example - basic (cmake) - name: Build example - basic (cmake)
working-directory: examples/basic/ working-directory: examples/basic/
run: | run: |
cmake . cmake . ${{ matrix.additional_arguments }}
cmake --build . cmake --build .
- name: Build example - calculator (cmake) - name: Build example - calculator (cmake)
working-directory: examples/calculator/ working-directory: examples/calculator/
run: | run: |
cmake . cmake . ${{ matrix.additional_arguments }}
cmake --build . cmake --build .
- name: Build example - sending_arguments (cmake) - name: Build example - sending_arguments (cmake)
working-directory: examples/sending_arguments/ working-directory: examples/sending_arguments/
run: | run: |
cmake . cmake . ${{ matrix.additional_arguments }}
cmake --build . cmake --build .

3
examples/basic/CMakeLists.txt
View File

@ -4,10 +4,9 @@ project(basic LANGUAGES CXX)
# SingleApplication base class # SingleApplication base class
set(QAPPLICATION_CLASS QCoreApplication) set(QAPPLICATION_CLASS QCoreApplication)
add_subdirectory(../.. SingleApplication)
add_executable(basic main.cpp) add_executable(basic main.cpp)
find_package(Qt5 COMPONENTS Core REQUIRED)
add_subdirectory(../.. SingleApplication)
target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication) target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication)

5
examples/calculator/CMakeLists.txt
View File

@ -6,6 +6,9 @@ set(CMAKE_AUTOMOC ON)
# SingleApplication base class # SingleApplication base class
set(QAPPLICATION_CLASS QApplication) set(QAPPLICATION_CLASS QApplication)
add_subdirectory(../.. SingleApplication)
find_package(Qt${QT_DEFAULT_MAJOR_VERSION} COMPONENTS Core REQUIRED)
add_executable(${PROJECT_NAME} add_executable(${PROJECT_NAME}
button.h button.h
@ -15,6 +18,4 @@ add_executable(${PROJECT_NAME}
main.cpp main.cpp
) )
find_package(Qt5 COMPONENTS Widgets REQUIRED)
add_subdirectory(../.. SingleApplication)
target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication) target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication)

5
examples/sending_arguments/CMakeLists.txt
View File

@ -6,6 +6,9 @@ set(CMAKE_AUTOMOC ON)
# SingleApplication base class # SingleApplication base class
set(QAPPLICATION_CLASS QCoreApplication) set(QAPPLICATION_CLASS QCoreApplication)
add_subdirectory(../.. SingleApplication)
find_package(Qt${QT_DEFAULT_MAJOR_VERSION} COMPONENTS Core REQUIRED)
add_executable(${PROJECT_NAME} add_executable(${PROJECT_NAME}
main.cpp main.cpp
@ -14,6 +17,4 @@ add_executable(${PROJECT_NAME}
main.cpp main.cpp
) )
find_package(Qt5 COMPONENTS Core REQUIRED)
add_subdirectory(../.. SingleApplication)
target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication) target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication)