diff --git a/.github/workflows/all-builds.yml b/.github/workflows/all-builds.yml index f05e3da..ab1029a 100644 --- a/.github/workflows/all-builds.yml +++ b/.github/workflows/all-builds.yml @@ -73,7 +73,9 @@ jobs: - name: Package Qtk Library (DEB) if: matrix.os == 'ubuntu-latest' shell: bash - run: cpack -C Release -G DEB + run: | + cd build + cpack -C Release -G DEB - name: Upload package artifacts (DEB) if: matrix.os == 'ubuntu-latest' @@ -171,7 +173,9 @@ jobs: - name: Package Qtk Library (DEB) if: matrix.os == 'ubuntu-latest' shell: bash - run: cpack -C Release -G DEB + run: | + cd build + cpack -C Release -G DEB - name: Upload package artifacts (DEB) if: matrix.os == 'ubuntu-latest' diff --git a/CMakeLists.txt b/CMakeLists.txt index 6602dfb..57cc0a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 # If Qtk is built within Qt Creator this is not required. 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) # TODO: This might be a bit strange and needs more testing. set(CMAKE_INSTALL_PREFIX "${QT_INSTALL_DIR}") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 63af681..0983904 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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_PACKAGE_DIRECTORY packages/) 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_PACKAGE_INSTALL_DIRECTORY "Qtk") @@ -147,10 +147,8 @@ set( #set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/resources/icon.png") # Debian -# TODO: Fix output sharedlib path. set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${CPACK_PACKAGE_HOMEPAGE_URL}) set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) -#set(CPACK_PACKAGING_INSTALL_PREFIX /usr/local/) # OSX set(CPACK_BUNDLE_NAME ${PROJECT_NAME}) diff --git a/src/qtk/CMakeLists.txt b/src/qtk/CMakeLists.txt index 1ec166b..42b9dcc 100644 --- a/src/qtk/CMakeLists.txt +++ b/src/qtk/CMakeLists.txt @@ -77,6 +77,3 @@ endif() if(WIN32) target_link_libraries(qtk_library PUBLIC OpenGL::GL) endif() - -#install(SCRIPT ${LIBQTK_DEPLOY_SCRIPT} COMPONENT libqtk) -## Install qtk_library to Qt Designer to support widget plugins.