Compare commits
1 Commits
5a23df110c
...
bf137bc788
Author | SHA1 | Date |
---|---|---|
Shaun Reed | bf137bc788 |
|
@ -70,20 +70,6 @@ jobs:
|
||||||
shell: bash
|
shell: bash
|
||||||
run: cmake --build build/ --target package --config Release
|
run: cmake --build build/ --target package --config Release
|
||||||
|
|
||||||
- name: Package Qtk Library (DEB)
|
|
||||||
if: matrix.os == 'ubuntu-latest'
|
|
||||||
shell: bash
|
|
||||||
run: cpack -C Release -G DEB
|
|
||||||
|
|
||||||
- name: Upload package artifacts (DEB)
|
|
||||||
if: matrix.os == 'ubuntu-latest'
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: qtk-${{ matrix.os }}-debian
|
|
||||||
path: |
|
|
||||||
build/packages/*.deb
|
|
||||||
!build/packages/_CPack_Packages/*
|
|
||||||
|
|
||||||
- name: Upload Qtk install directory
|
- name: Upload Qtk install directory
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
|
@ -169,20 +155,6 @@ jobs:
|
||||||
shell: bash
|
shell: bash
|
||||||
run: cmake --build build/ --target package --config Release
|
run: cmake --build build/ --target package --config Release
|
||||||
|
|
||||||
- name: Package Qtk Library (DEB)
|
|
||||||
if: matrix.os == 'ubuntu-latest'
|
|
||||||
shell: bash
|
|
||||||
run: cpack -C Release -G DEB
|
|
||||||
|
|
||||||
- name: Upload package artifacts (DEB)
|
|
||||||
if: matrix.os == 'ubuntu-latest'
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: libqtk-${{ matrix.os }}-debian
|
|
||||||
path: |
|
|
||||||
build/packages/*.deb
|
|
||||||
!build/packages/_CPack_Packages/*
|
|
||||||
|
|
||||||
- name: Upload libqtk install
|
- name: Upload libqtk install
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
if: always()
|
if: always()
|
||||||
|
@ -197,7 +169,6 @@ jobs:
|
||||||
name: libqtk-packages-${{ matrix.os }}
|
name: libqtk-packages-${{ matrix.os }}
|
||||||
path: |
|
path: |
|
||||||
build/packages/
|
build/packages/
|
||||||
!build/packages/*.deb
|
|
||||||
!build/packages/_CPack_Packages/*
|
!build/packages/_CPack_Packages/*
|
||||||
|
|
||||||
Build-Qtk-Plugins:
|
Build-Qtk-Plugins:
|
||||||
|
|
|
@ -23,7 +23,7 @@ if(WIN32)
|
||||||
set(CMAKE_COMPILE_WARNING_AS_ERROR OFF)
|
set(CMAKE_COMPILE_WARNING_AS_ERROR OFF)
|
||||||
add_compile_options(/wd4131 /wd4127)
|
add_compile_options(/wd4131 /wd4127)
|
||||||
endif()
|
endif()
|
||||||
add_compile_options(-fPIC)
|
#add_compile_options(-fPIC)
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Project
|
# Project
|
||||||
|
|
|
@ -36,7 +36,7 @@ target_link_libraries(qtk_plugin_library PUBLIC Qt6::UiPlugin qtk_library)
|
||||||
# Qtk Widget Collection Plugin
|
# Qtk Widget Collection Plugin
|
||||||
################################################################################
|
################################################################################
|
||||||
# Create a Qt Designer plugin for a collection of widgets from our library.
|
# Create a Qt Designer plugin for a collection of widgets from our library.
|
||||||
qt_add_plugin(qtk_collection SHARED)
|
qt_add_plugin(qtk_collection SHARED EXCLUDE_FROM_ALL)
|
||||||
target_sources(
|
target_sources(
|
||||||
qtk_collection PRIVATE
|
qtk_collection PRIVATE
|
||||||
widgetplugincollection.cpp widgetplugincollection.h
|
widgetplugincollection.cpp widgetplugincollection.h
|
||||||
|
|
Loading…
Reference in New Issue