Unverified Commit 6f592b75 authored by azubieta's avatar azubieta

Rename project to appimage-cli-tool

parent 5c2bcb17
Pipeline #439 passed with stages
in 7 minutes and 12 seconds
......@@ -12,7 +12,7 @@ build:debian_buster_pkg:
- cpack -G DEB -G DEB -R 0.1.4-debian-buster
artifacts:
paths:
- appimage-user-tool*.deb
- appimage-cli-tool*.deb
test:debian_buster_pkg:
image: debian:buster
......@@ -21,7 +21,7 @@ test:debian_buster_pkg:
- build:debian_buster_pkg
script:
- apt -y -qq update && apt -y -qq install ./appimage-user-tool*
- apt -y -qq update && apt -y -qq install ./appimage-cli-tool*
- app --help
## Ubuntu Bionic Package
......@@ -34,7 +34,7 @@ build:ubuntu_bionic_pkg:
- cpack -G DEB -G DEB -R 0.1.4-ubuntu-bionic
artifacts:
paths:
- appimage-user-tool*.deb
- appimage-cli-tool*.deb
test:ubuntu_bionic_pkg:
image: ubuntu:bionic
......@@ -43,7 +43,7 @@ test:ubuntu_bionic_pkg:
- build:ubuntu_bionic_pkg
script:
- apt -y -qq update && apt -y -qq install ./appimage-user-tool*
- apt -y -qq update && apt -y -qq install ./appimage-cli-tool*
- app --help
## Centos 7 Package
......@@ -51,12 +51,12 @@ build:centos_7_pkg:
image: azubieta90/appimage-user-tool-build:centos-7
stage: build
script:
- cmake3 . -DCPACK_RPM_PACKAGE_PROVIDES='libappimage.so.1.0()(64bit), libKF5Attica.so.5()(64bit)' -DCPACK_RPM_PACKAGE_REQUIRES='boost-filesystem, libarchive, cairo, librsvg2' -DINSTALL_LIBAPPIMAGE=On -DINSTALL_ATTICA=On -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DAPPIMAGE_USER_TOOL_V_SUFFIX='-centos-7'
- cmake3 . -DCPACK_RPM_PACKAGE_PROVIDES='libappimage.so.1.0()(64bit), libKF5Attica.so.5()(64bit)' -DCPACK_RPM_PACKAGE_REQUIRES='boost-filesystem, libarchive, cairo, librsvg2' -DINSTALL_LIBAPPIMAGE=On -DINSTALL_ATTICA=On -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DAPPIMAGE_CLI_TOOL_V_SUFFIX='-centos-7'
- make -j`nproc`
- cpack3 -G DEB -G RPM
artifacts:
paths:
- appimage-user-tool*.rpm
- appimage-cli-tool*.rpm
test:centos_7_pkg:
image: centos:7
......@@ -65,7 +65,7 @@ test:centos_7_pkg:
- build:centos_7_pkg
script:
- yum -y update && yum install -y ./appimage-user-tool*.rpm
- yum -y update && yum install -y ./appimage-cli-tool*.rpm
- app --help
## OpenSuse Leap Package
......@@ -73,12 +73,12 @@ build:opensue_leap_pkg:
image: azubieta90/appimage-user-tool-build:opensuse-leap
stage: build
script:
- cmake . -DCPACK_RPM_PACKAGE_PROVIDES='libappimage.so.1.0()(64bit), libKF5Attica.so.5()(64bit)' -DCPACK_RPM_PACKAGE_REQUIRES='libboost_filesystem1_66_0, libarchive13, cairo, librsvg2' -DINSTALL_LIBAPPIMAGE=On -DINSTALL_ATTICA=On -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DAPPIMAGE_USER_TOOL_V_SUFFIX='-centos-7'
- cmake . -DCPACK_RPM_PACKAGE_PROVIDES='libappimage.so.1.0()(64bit), libKF5Attica.so.5()(64bit)' -DCPACK_RPM_PACKAGE_REQUIRES='libboost_filesystem1_66_0, libarchive13, cairo, librsvg2' -DINSTALL_LIBAPPIMAGE=On -DINSTALL_ATTICA=On -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DAPPIMAGE_CLI_TOOL_V_SUFFIX='-centos-7'
- make -j`nproc`
- cpack -G DEB -G RPM
artifacts:
paths:
- appimage-user-tool*.rpm
- appimage-cli-tool*.rpm
test:opensue_leap_pkg:
image: opensuse/leap:15
......@@ -91,7 +91,7 @@ test:opensue_leap_pkg:
- zypper addrepo https://download.opensuse.org/repositories/KDE:/Qt5/openSUSE_Leap_15.0/KDE:Qt5.repo
- zypper addrepo https://download.opensuse.org/repositories/KDE:/Frameworks5/openSUSE_Leap_15.0/KDE:Frameworks5.repo
- zypper --non-interactive --no-gpg-checks refresh
- zypper --non-interactive --no-gpg-checks install ./appimage-user-tool*.rpm
- zypper --non-interactive --no-gpg-checks install ./appimage-cli-tool*.rpm
- app --help
# Arch package
......@@ -104,14 +104,14 @@ test:opensue_leap_pkg:
# - cd build && makepkg
# artifacts:
# paths:
# - build/appimage-user-tool*.pkg
# - build/appimage-cli-tool*.pkg
#
#
#test:arch_pkg:
# image: archlinux/base
# stage: test
# script:
# - pacman -Sp --noconfirm build/appimage-user-tool*.pkg
# - pacman -Sp --noconfirm build/appimage-cli-tool*.pkg
# - app --help
# dependencies:
# - build:arch_pkg
......
......@@ -49,7 +49,7 @@ matrix:
- /opt/qt510/bin/qt510-env.sh
- export SOURCES_DIR=${PWD}
- mkdir -p ${PROJECT_BUILD_DIR}
- cd ${PROJECT_BUILD_DIR}; ${SOURCES_DIR}/.travis/build_appimage-user-tool.sh
- cd ${PROJECT_BUILD_DIR}; ${SOURCES_DIR}/.travis/build_appimage-cli-tool.sh
- cd ${PROJECT_BUILD_DIR}; ${SOURCES_DIR}/.travis/build_appimage.sh
## Build Debian buster package
......@@ -83,7 +83,7 @@ after_success:
# make sure only pushes to rewrite create a new release, otherwise pretend PR and upload to transfer.sh
- if [ "$TRAVIS_BRANCH" != "$TRAVIS_TAG" ] && [ "$TRAVIS_BRANCH" != "master" ]; then export TRAVIS_EVENT_TYPE=pull_request; fi
- wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
- bash upload.sh appimage-user-tool*.AppImage*
- bash upload.sh docker-build-release/appimage-user-tool*.rpm
- bash upload.sh docker-build-release/appimage-user-tool*.deb
- bash upload.sh docker-build-release/appimage-user-tool*.pkg.tar.xz
- bash upload.sh appimage-cli-tool*.AppImage*
- bash upload.sh docker-build-release/appimage-cli-tool*.rpm
- bash upload.sh docker-build-release/appimage-cli-tool*.deb
- bash upload.sh docker-build-release/appimage-cli-tool*.pkg.tar.xz
# Maintainer: Alexis Lopez Zubieta <contact@azubieta.net>
projectname=appimage-user-tool
projectname=appimage-cli-tool
pkgname=appimage-user-tool
pkgname=appimage-cli-tool
pkgver=0.1.4
pkgrel=1
epoch=
......
......@@ -24,7 +24,7 @@ sudo docker run -v ${PWD}:/source -v ${PWD}/docker-build-release:/build ${DOCKER
-DINSTALL_ATTICA=On\
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DAPPIMAGE_USER_TOOL_V_SUFFIX=\"-centos-7\" \
-DAPPIMAGE_CLI_TOOL_V_SUFFIX=\"-centos-7\" \
-DCPACK_RPM_PACKAGE_REQUIRES='${CENTOS7_PACKAGE_REQUIRES}' \
-DCPACK_RPM_PACKAGE_PROVIDES='${CENTOS7_PACKAGE_PROVIDES}' &&\
make -j`nproc` &&\
......
......@@ -25,7 +25,7 @@ sudo docker run -v ${PWD}:/source -v ${PWD}/docker-build-release:/build ${DOCKER
-DINSTALL_ATTICA=On\
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DAPPIMAGE_USER_TOOL_V_SUFFIX=\"-opensuse-leap\" \
-DAPPIMAGE_CLI_TOOL_V_SUFFIX=\"-opensuse-leap\" \
-DCPACK_RPM_PACKAGE_REQUIRES='${OPENSUSE_PACKAGE_REQUIRES}' \
-DCPACK_RPM_PACKAGE_PROVIDES='${OPENSUSE_PACKAGE_PROVIDES}' &&\
make -j`nproc` &&\
......
cmake_minimum_required(VERSION 3.8)
project(appimage-user-tool)
project(appimage-cli-tool)
set(CMAKE_CXX_STANDARD 11)
......
# appimage-user-tool
# appimage-cli-tool
CLI client for <http://www.appimagehub.com>. Allows to search, install, remove and update applications using the AppImage
package format.
......
......@@ -22,15 +22,15 @@ set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
set(CPACK_DEBIAN_COMPRESSION_TYPE xz)
# use git hash as package release
set(CPACK_DEBIAN_PACKAGE_RELEASE "git${APPIMAGE_USER_TOOL_GIT_COMMIT_DATE_SHORT}.${APPIMAGE_USER_TOOL_GIT_COMMIT}")
set(CPACK_DEBIAN_PACKAGE_RELEASE "git${APPIMAGE_CLI_TOOL_GIT_COMMIT_DATE_SHORT}.${APPIMAGE_CLI_TOOL_GIT_COMMIT}")
if(CPACK_DEBIAN_COMPATIBILITY_LEVEL)
set(CPACK_DEBIAN_PACKAGE_RELEASE "${CPACK_DEBIAN_PACKAGE_RELEASE}+${CPACK_DEBIAN_COMPATIBILITY_LEVEL}")
endif()
# Custom package names
set(CPACK_DEBIAN_APPIMAGE_USER_TOOL_PACKAGE_NAME appimage-user-tool)
set(CPACK_DEBIAN_APPIMAGE_USER_TOOL_SETTINGS_PACKAGE_NAME appimage-user-tool-settings)
set(CPACK_DEBIAN_APPIMAGE_CLI_TOOL_PACKAGE_NAME appimage-cli-tool)
set(CPACK_DEBIAN_APPIMAGE_CLI_TOOL_SETTINGS_PACKAGE_NAME appimage-cli-tool-settings)
# Dependencies
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
# general CPack options
set(PROJECT_VERSION ${APPIMAGE_USER_TOOL_VERSION})
set(PROJECT_VERSION ${APPIMAGE_CLI_TOOL_VERSION})
# make sure to only package APPIMAGE_USER_TOOL component
set(CPACK_COMPONENTS_ALL APPIMAGE_USER_TOOL APPIMAGE_USER_TOOL_SETTINGS)
# make sure to only package APPIMAGE_CLI_TOOL component
set(CPACK_COMPONENTS_ALL APPIMAGE_CLI_TOOL APPIMAGE_CLI_TOOL_SETTINGS)
# global options
set(CPACK_PACKAGE_CONTACT "Alexis Lopez Zubieta")
set(CPACK_PACKAGE_HOMEPAGE "https://github.com/azubieta/appimage-user-tools")
set(CPACK_PACKAGE_HOMEPAGE "https://github.com/azubieta/appimage-cli-tool")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
# versioning
# it appears setting CPACK_DEBIAN_PACKAGE_VERSION doesn't work, hence setting CPACK_PACKAGE_VERSION
set(CPACK_PACKAGE_VERSION ${APPIMAGE_USER_TOOL_VERSION})
set(CPACK_PACKAGE_VERSION ${APPIMAGE_CLI_TOOL_VERSION})
# TODO: insert some useful description
set(CPACK_COMPONENT_APPIMAGE_USER_TOOL_PACKAGE_DESCRIPTION "AppImage User Tools")
set(CPACK_COMPONENT_APPIMAGE_CLI_TOOL_PACKAGE_DESCRIPTION "AppImage User Tools")
# find more suitable section for package
set(CPACK_COMPONENT_APPIMAGE_USER_TOOL_PACKAGE_SECTION misc)
set(CPACK_COMPONENT_APPIMAGE_CLI_TOOL_PACKAGE_SECTION misc)
......@@ -5,8 +5,8 @@ set(CPACK_RPM_PACKAGE_AUTOPROV 1)
set(CPACK_RPM_COMPONENT_INSTALL ON)
set(CPACK_RPM_APPIMAGE_USER_TOOL_PACKAGE_NAME appimage-user-tool)
set(CPACK_RPM_APPIMAGE_USER_TOOL_SETTINGS_PACKAGE_NAME appimage-user-tool-settings)
set(CPACK_RPM_APPIMAGE_CLI_TOOL_PACKAGE_NAME appimage-cli-tool)
set(CPACK_RPM_APPIMAGE_CLI_TOOL_SETTINGS_PACKAGE_NAME appimage-cli-tool-settings)
set(CPACK_RPM_APPIMAGE_USER_TOOL_FILE_NAME RPM-DEFAULT)
set(CPACK_RPM_APPIMAGE_USER_TOOL_SETTINGS_FILE_NAME RPM-DEFAULT)
set(CPACK_RPM_APPIMAGE_CLI_TOOL_FILE_NAME RPM-DEFAULT)
set(CPACK_RPM_APPIMAGE_CLI_TOOL_SETTINGS_FILE_NAME RPM-DEFAULT)
......@@ -2,11 +2,11 @@
# borrowed from AppImageLauncher #
##################################
set(APPIMAGE_USER_TOOL_V_MAJOR 0)
set(APPIMAGE_USER_TOOL_V_MINOR 1)
set(APPIMAGE_USER_TOOL_V_PATCH 4)
set(APPIMAGE_CLI_TOOL_V_MAJOR 0)
set(APPIMAGE_CLI_TOOL_V_MINOR 1)
set(APPIMAGE_CLI_TOOL_V_PATCH 4)
set(APPIMAGE_USER_TOOL_VERSION ${APPIMAGE_USER_TOOL_V_MAJOR}.${APPIMAGE_USER_TOOL_V_MINOR}.${APPIMAGE_USER_TOOL_V_PATCH}${APPIMAGE_USER_TOOL_V_SUFFIX})
set(APPIMAGE_CLI_TOOL_VERSION ${APPIMAGE_CLI_TOOL_V_MAJOR}.${APPIMAGE_CLI_TOOL_V_MINOR}.${APPIMAGE_CLI_TOOL_V_PATCH}${APPIMAGE_CLI_TOOL_V_SUFFIX})
# check whether git is available
find_program(GIT git)
......@@ -20,7 +20,7 @@ if(NOT GIT STREQUAL "GIT-NOTFOUND")
execute_process(
COMMAND git rev-parse --short HEAD
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
OUTPUT_VARIABLE APPIMAGE_USER_TOOL_GIT_COMMIT
OUTPUT_VARIABLE APPIMAGE_CLI_TOOL_GIT_COMMIT
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
RESULT_VARIABLE GIT_RESULT
......@@ -28,7 +28,7 @@ if(NOT GIT STREQUAL "GIT-NOTFOUND")
if(GIT_RESULT EQUAL 0)
message(STATUS "Storing git commit ID in cache file")
file(WRITE "${GIT_COMMIT_CACHE_FILE}" "${APPIMAGE_USER_TOOL_GIT_COMMIT}")
file(WRITE "${GIT_COMMIT_CACHE_FILE}" "${APPIMAGE_CLI_TOOL_GIT_COMMIT}")
endif()
endif()
......@@ -39,51 +39,51 @@ if(NOT GIT_RESULT EQUAL 0)
message(WARNING "Failed to gather commit ID via git command, trying to read cache file")
if(EXISTS "${GIT_COMMIT_CACHE_FILE}")
file(READ "${GIT_COMMIT_CACHE_FILE}" APPIMAGE_USER_TOOL_CACHED_GIT_COMMIT)
mark_as_advanced(FORCE APPIMAGE_USER_TOOL_CACHED_GIT_COMMIT)
string(REPLACE "\n" "" APPIMAGE_USER_TOOL_GIT_COMMIT "${APPIMAGE_USER_TOOL_CACHED_GIT_COMMIT}")
file(READ "${GIT_COMMIT_CACHE_FILE}" APPIMAGE_CLI_TOOL_CACHED_GIT_COMMIT)
mark_as_advanced(FORCE APPIMAGE_CLI_TOOL_CACHED_GIT_COMMIT)
string(REPLACE "\n" "" APPIMAGE_CLI_TOOL_GIT_COMMIT "${APPIMAGE_CLI_TOOL_CACHED_GIT_COMMIT}")
else()
message(FATAL_ERROR "Could not find git commit cache file, git commit ID not available for versioning")
endif()
endif()
if("${APPIMAGE_USER_TOOL_GIT_COMMIT}" STREQUAL "")
message(FATAL_ERROR "Invalid git commit ID: ${APPIMAGE_USER_TOOL_GIT_COMMIT}")
if("${APPIMAGE_CLI_TOOL_GIT_COMMIT}" STREQUAL "")
message(FATAL_ERROR "Invalid git commit ID: ${APPIMAGE_CLI_TOOL_GIT_COMMIT}")
endif()
message(STATUS "Git commit: ${APPIMAGE_USER_TOOL_GIT_COMMIT}")
mark_as_advanced(FORCE APPIMAGE_USER_TOOL_GIT_COMMIT)
message(STATUS "Git commit: ${APPIMAGE_CLI_TOOL_GIT_COMMIT}")
mark_as_advanced(FORCE APPIMAGE_CLI_TOOL_GIT_COMMIT)
# add build number based on Travis build number if possible
if("$ENV{TRAVIS_BUILD_NUMBER}" STREQUAL "")
set(APPIMAGE_USER_TOOL_BUILD_NUMBER "<local dev build>")
set(APPIMAGE_CLI_TOOL_BUILD_NUMBER "<local dev build>")
else()
set(APPIMAGE_USER_TOOL_BUILD_NUMBER "$ENV{TRAVIS_BUILD_NUMBER}")
set(APPIMAGE_CLI_TOOL_BUILD_NUMBER "$ENV{TRAVIS_BUILD_NUMBER}")
endif()
# get current date
execute_process(
COMMAND env LC_ALL=C date -u "+%Y-%m-%d %H:%M:%S %Z"
OUTPUT_VARIABLE APPIMAGE_USER_TOOL_BUILD_DATE
OUTPUT_VARIABLE APPIMAGE_CLI_TOOL_BUILD_DATE
OUTPUT_STRIP_TRAILING_WHITESPACE
)
# get current date, short form
execute_process(
COMMAND env LC_ALL=C git show -s --format=%ci ${APPIMAGE_USER_TOOL_GIT_COMMIT}
OUTPUT_VARIABLE APPIMAGE_USER_TOOL_GIT_COMMIT_DATE
COMMAND env LC_ALL=C git show -s --format=%ci ${APPIMAGE_CLI_TOOL_GIT_COMMIT}
OUTPUT_VARIABLE APPIMAGE_CLI_TOOL_GIT_COMMIT_DATE
OUTPUT_STRIP_TRAILING_WHITESPACE
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
)
execute_process(
COMMAND env LC_ALL=C date -u "+%Y%m%d" -d ${APPIMAGE_USER_TOOL_GIT_COMMIT_DATE}
OUTPUT_VARIABLE APPIMAGE_USER_TOOL_GIT_COMMIT_DATE_SHORT
COMMAND env LC_ALL=C date -u "+%Y%m%d" -d ${APPIMAGE_CLI_TOOL_GIT_COMMIT_DATE}
OUTPUT_VARIABLE APPIMAGE_CLI_TOOL_GIT_COMMIT_DATE_SHORT
OUTPUT_STRIP_TRAILING_WHITESPACE
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
)
add_definitions(-DAPPIMAGE_USER_TOOL_VERSION="${APPIMAGE_USER_TOOL_VERSION}")
add_definitions(-DAPPIMAGE_USER_TOOL_GIT_COMMIT="${APPIMAGE_USER_TOOL_GIT_COMMIT}")
add_definitions(-DAPPIMAGE_USER_TOOL_BUILD_NUMBER="${APPIMAGE_USER_TOOL_BUILD_NUMBER}")
add_definitions(-DAPPIMAGE_USER_TOOL_BUILD_DATE="${APPIMAGE_USER_TOOL_BUILD_DATE}")
add_definitions(-DAPPIMAGE_CLI_TOOL_VERSION="${APPIMAGE_CLI_TOOL_VERSION}")
add_definitions(-DAPPIMAGE_CLI_TOOL_GIT_COMMIT="${APPIMAGE_CLI_TOOL_GIT_COMMIT}")
add_definitions(-DAPPIMAGE_CLI_TOOL_BUILD_NUMBER="${APPIMAGE_CLI_TOOL_BUILD_NUMBER}")
add_definitions(-DAPPIMAGE_CLI_TOOL_BUILD_DATE="${APPIMAGE_CLI_TOOL_BUILD_DATE}")
install(FILES appimage_logo.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps COMPONENT APPIMAGE_USER_TOOL)
install(FILES org.appimage.user-tool.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications COMPONENT APPIMAGE_USER_TOOL)
install(FILES org.appimage.user-tool-settings.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications COMPONENT APPIMAGE_USER_TOOL_SETTINGS)
install(FILES appimage_logo.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps COMPONENT APPIMAGE_CLI_TOOL)
install(FILES org.appimage.user-tool.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications COMPONENT APPIMAGE_CLI_TOOL)
install(FILES org.appimage.user-tool-settings.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications COMPONENT APPIMAGE_CLI_TOOL_SETTINGS)
# Sources settings
install(FILES appimage-providers.yaml DESTINATION /etc COMPONENT APPIMAGE_USER_TOOL)
install(FILES appimage-providers.yaml DESTINATION /etc COMPONENT APPIMAGE_CLI_TOOL)
configure_file("appimage-providers.yaml" "${PROJECT_BINARY_DIR}/appimage-providers.yaml" COPYONLY)
[Desktop Entry]
Version=1.0
Type=Application
Name=appimage-user-tools-settings
Name=appimage-cli-tool-settings
Comment=Configure AppImage providers
TryExec=appimage-user-tools-settings
Exec=appimage-user-tools-settings %F
TryExec=appimage-cli-tool-settings
Exec=appimage-cli-tool-settings %F
Icon=appimage_logo
Categories=Utility;
[Desktop Entry]
Version=1.0
Type=Application
Name=appimage-user-tool
Name=appimage-cli-tool
Comment=Manage AppImages on your system and uses appimagehub.com as source
TryExec=app
Exec=app %F
......
......@@ -21,7 +21,7 @@ if(INSTALL_LIBAPPIMAGE)
FILES
$<TARGET_SONAME_FILE:libappimage>
$<TARGET_LINKER_FILE:libappimage>
DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME} COMPONENT APPIMAGE_USER_TOOL
DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME} COMPONENT APPIMAGE_CLI_TOOL
)
endif()
......@@ -30,6 +30,6 @@ if(INSTALL_ATTICA)
FILES
$<TARGET_SONAME_FILE:KF5::Attica>
$<TARGET_LINKER_FILE:KF5::Attica>
DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME} COMPONENT APPIMAGE_USER_TOOL
DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME} COMPONENT APPIMAGE_CLI_TOOL
)
endif()
......@@ -31,5 +31,5 @@ add_dependencies(app core settings-common)
# Install
install(
TARGETS app
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT APPIMAGE_USER_TOOL
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT APPIMAGE_CLI_TOOL
)
......@@ -6,7 +6,7 @@ target_include_directories(settings-common PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
if(BUILD_SETTINGS_DIALOG)
add_executable(
appimage-user-tools-settings
appimage-cli-tool-settings
main.cpp
SettingsDialog.h
SettingsDialog.cpp
......@@ -15,14 +15,14 @@ if(BUILD_SETTINGS_DIALOG)
$<TARGET_OBJECTS:settings-common>
)
configure_module(appimage-user-tools-settings)
target_link_libraries(appimage-user-tools-settings PRIVATE Qt5::Core Qt5::Widgets yaml-cpp)
configure_module(appimage-cli-tool-settings)
target_link_libraries(appimage-cli-tool-settings PRIVATE Qt5::Core Qt5::Widgets yaml-cpp)
add_dependencies(appimage-user-tools-settings settings-common)
add_dependencies(appimage-cli-tool-settings settings-common)
# Install
install(
TARGETS appimage-user-tools-settings
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT APPIMAGE_USER_TOOL_SETTINGS
TARGETS appimage-cli-tool-settings
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT APPIMAGE_CLI_TOOL_SETTINGS
)
endif()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment