diff --git a/.travis.yml b/.travis.yml index b12f22b..5072ac4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,29 +1,26 @@ language: cpp compiler: gcc sudo: require -dist: trusty +dist: bionic cache: ccache: true directories: - $HOME/.ccache - $HOME/.cache/apt - #- $HOME/.cache/mpv-build before_install: - mkdir -p $HOME/.cache/apt/partial - sudo rm -rf /var/cache/apt/archives - sudo ln -s $HOME/.cache/apt /var/cache/apt/archives - - sudo add-apt-repository ppa:beineri/opt-qt-5.10.1-trusty -y + - sudo add-apt-repository ppa:beineri/opt-qt-5.12.6-bionic -y - sudo apt-get update install: - - sudo apt-get -y install ccache qt510-meta-minimal qt510quickcontrols qt510quickcontrols2 qt510svg qt510x11extras qt510graphicaleffects libgl1-mesa-dev x11proto-xext-dev libx11-dev python3-setuptools + - sudo apt-get -y install ccache build-essential git qt512-meta-minimal qt512quickcontrols qt512quickcontrols2 qt512svg qt512x11extras qt512graphicaleffects qt512svg libgl1-mesa-dev libmpv-dev libgl1-mesa-dev x11proto-xext-dev libx11-dev python3-setuptools - sudo apt-get build-dep mpv - source /opt/qt*/bin/qt*-env.sh script: - - wget https://github.com/NamedKitten/mpv-builder/releases/download/continuous/deps.tar.xz - - sudo tar xvf deps.tar.xz -C / - time bash scripts/makeappimage.sh after_success: diff --git a/CMakeLists.txt b/CMakeLists.txt index f6b2ecd..fae13b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,9 +106,8 @@ include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS} ${Qt5Concurrent_INCLUDE_DIRS} qt5_use_modules(KittehPlayer Qml Quick Core Gui Widgets X11Extras) if(OLD_UBUNTU) -install (FILES "${PROJECT_NAME}-Wrapper" DESTINATION bin RENAME "${PROJECT_NAME}") -install (FILES "${PROJECT_NAME}-Wrapper" DESTINATION bin RENAME "${PROJECT_NAME}-bin") - +install (FILES "${PROJECT_NAME}-Wrapper" DESTINATION bin RENAME "${PROJECT_NAME}" PERMISSIONS WORLD_READ WORLD_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE OWNER_READ OWNER_WRITE OWNER_EXECUTE) +install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME} DESTINATION bin RENAME "${PROJECT_NAME}-bin" PERMISSIONS WORLD_READ WORLD_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE OWNER_READ OWNER_WRITE OWNER_EXECUTE) else() install (TARGETS ${PROJECT_NAME} DESTINATION bin) endif()