shaunrd0
/
qtk
1
1
Fork 0
Code Issues 9 Pull Requests 1 Actions Projects Releases Wiki Activity

Fix CI

This commit is contained in:
Shaun Reed 2023-03-11 18:58:02 -05:00
parent 6a52eee501
commit 9f63fb6074
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/all-builds.yml vendored
View File

@ -73,7 +73,9 @@ jobs:
- name: Package Qtk Library (DEB) - name: Package Qtk Library (DEB)
if: matrix.os == 'ubuntu-latest' if: matrix.os == 'ubuntu-latest'
shell: bash shell: bash
run: cpack -C Release -G DEB run: |
cd build
cpack -C Release -G DEB
- name: Upload package artifacts (DEB) - name: Upload package artifacts (DEB)
if: matrix.os == 'ubuntu-latest' if: matrix.os == 'ubuntu-latest'
@ -171,7 +173,9 @@ jobs:
- name: Package Qtk Library (DEB) - name: Package Qtk Library (DEB)
if: matrix.os == 'ubuntu-latest' if: matrix.os == 'ubuntu-latest'
shell: bash shell: bash
run: cpack -C Release -G DEB run: |
cd build
cpack -C Release -G DEB
- name: Upload package artifacts (DEB) - name: Upload package artifacts (DEB)
if: matrix.os == 'ubuntu-latest' if: matrix.os == 'ubuntu-latest'

2
CMakeLists.txt
View File

@ -79,8 +79,6 @@ set(QT_INSTALL_DIR "$ENV{HOME}/Qt/6.5.0/gcc_64" CACHE PATH "Path to Qt6 install.
# Point CMAKE_PREFIX_PATH to Qt6 install directory # Point CMAKE_PREFIX_PATH to Qt6 install directory
# If Qtk is built within Qt Creator this is not required. # If Qtk is built within Qt Creator this is not required.
list(APPEND CMAKE_PREFIX_PATH "${QT_INSTALL_DIR}") list(APPEND CMAKE_PREFIX_PATH "${QT_INSTALL_DIR}")
# TODO: Remove if not using sdlibdeps.
#set(CMAKE_INSTALL_RPATH "${QT_INSTALL_DIR}/lib")
if (QTK_PREFIX_QTCREATOR) if (QTK_PREFIX_QTCREATOR)
# TODO: This might be a bit strange and needs more testing. # TODO: This might be a bit strange and needs more testing.
set(CMAKE_INSTALL_PREFIX "${QT_INSTALL_DIR}") set(CMAKE_INSTALL_PREFIX "${QT_INSTALL_DIR}")

4
src/CMakeLists.txt
View File

@ -119,7 +119,7 @@ set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/shaunrd0/qtk")
set(CPACK_SOURCE_IGNORE_FILES build*;install;\.git;\.github;\.idea) set(CPACK_SOURCE_IGNORE_FILES build*;install;\.git;\.github;\.idea)
set(CPACK_PACKAGE_DIRECTORY packages/) set(CPACK_PACKAGE_DIRECTORY packages/)
set(CPACK_PACKAGE_CONTACT "shaunreed.com") set(CPACK_PACKAGE_CONTACT "shaunreed.com")
#set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/resources/icon.png") set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/resources/icon.png")
set(CPACK_THREADS 0) set(CPACK_THREADS 0)
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Qtk") set(CPACK_PACKAGE_INSTALL_DIRECTORY "Qtk")
@ -147,10 +147,8 @@ set(
#set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/resources/icon.png") #set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/resources/icon.png")
# Debian # Debian
# TODO: Fix output sharedlib path.
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${CPACK_PACKAGE_HOMEPAGE_URL}) set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${CPACK_PACKAGE_HOMEPAGE_URL})
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
#set(CPACK_PACKAGING_INSTALL_PREFIX /usr/local/)
# OSX # OSX
set(CPACK_BUNDLE_NAME ${PROJECT_NAME}) set(CPACK_BUNDLE_NAME ${PROJECT_NAME})

3
src/qtk/CMakeLists.txt
View File

@ -77,6 +77,3 @@ endif()
if(WIN32) if(WIN32)
target_link_libraries(qtk_library PUBLIC OpenGL::GL) target_link_libraries(qtk_library PUBLIC OpenGL::GL)
endif() endif()
#install(SCRIPT ${LIBQTK_DEPLOY_SCRIPT} COMPONENT libqtk)
## Install qtk_library to Qt Designer to support widget plugins.