1
0
mirror of https://github.com/DigitalDevices/pvr.octonet.git synced 2023-10-10 13:36:57 +02:00

Merge pull request #33 from AlwinEsch/Matrix-change

[Matrix] update CMakeLists.txt to 3.5 and change include way
This commit is contained in:
Kai Sommerfeld 2019-09-23 12:21:19 +02:00 committed by GitHub
commit 8032f085fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 23 additions and 32 deletions

View File

@ -7,28 +7,22 @@ language: cpp
# Linux. We need Trusty in order to get up to date versions of
# cmake and g++.
#
env:
global:
- app_id=pvr.octonet
matrix:
include:
- os: linux
dist: trusty
dist: xenial
sudo: required
compiler: gcc
- os: linux
dist: trusty
dist: xenial
sudo: required
compiler: clang
- os: osx
osx_image: xcode7.3
- os: osx
osx_image: xcode6.1
#
# Some of the OS X images don't have cmake, contrary to what people
# on the Internet say
#
before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which cmake || brew update ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which cmake || brew install cmake ; fi
osx_image: xcode10.2
#
# The addon source is automatically checked out in $TRAVIS_BUILD_DIR,
@ -37,9 +31,9 @@ before_install:
before_script:
- cd $TRAVIS_BUILD_DIR/..
- git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git
- mkdir -p xbmc/cmake/addons/addons/pvr.octonet
- echo "pvr.octonet https://github.com/DigitalDevices/pvr.octonet master" > xbmc/cmake/addons/addons/pvr.octonet/pvr.octonet.txt
- cd $TRAVIS_BUILD_DIR && mkdir build && cd build
- cmake -DADDONS_TO_BUILD=pvr.octonet -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons
- cd ${app_id} && mkdir build && cd build
- mkdir -p definition/${app_id}
- echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt
- cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons
script: make

View File

@ -1,9 +1,7 @@
cmake_minimum_required(VERSION 3.5)
project(pvr.octonet)
cmake_minimum_required(VERSION 2.6)
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
enable_language(CXX)
find_package(Kodi REQUIRED)
find_package(p8-platform REQUIRED)
@ -11,7 +9,7 @@ find_package(JsonCpp REQUIRED)
include_directories(
${p8-platform_INCLUDE_DIRS}
${KODI_INCLUDE_DIR}
${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways
${JSONCPP_INCLUDE_DIRS})
set(DEPLIBS

View File

@ -1,7 +1,6 @@
cmake_minimum_required(VERSION 3.5)
project(jsoncpp)
cmake_minimum_required(VERSION 3.1)
enable_language(CXX)
SET(CMAKE_CXX_STANDARD 11)
SET(CMAKE_CXX_STANDARD_REQUIRED ON)
SET(CMAKE_CXX_EXTENSIONS OFF)

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="pvr.octonet"
version="1.2.0"
version="1.2.1"
name="Digital Devices Octopus NET Client"
provider-name="digitaldevices">
<requires>@ADDON_DEPENDS@</requires>

View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#include "libXBMC_addon.h"
#include "kodi/libXBMC_addon.h"
#include <string>
#include "p8-platform/os.h"
#include "client.h"

View File

@ -21,10 +21,10 @@
*/
#include "client.h"
#include <xbmc_pvr_dll.h>
#include <libXBMC_addon.h>
#include <kodi/xbmc_pvr_dll.h>
#include <kodi/libXBMC_addon.h>
#include <p8-platform/util/util.h>
#include <libKODI_guilib.h>
#include <kodi/libKODI_guilib.h>
#include "OctonetData.h"
#include "rtsp_client.hpp"

View File

@ -21,8 +21,8 @@
*
*/
#include "libXBMC_addon.h"
#include "libXBMC_pvr.h"
#include "kodi/libXBMC_addon.h"
#include "kodi/libXBMC_pvr.h"
#ifndef __func__
#define __func__ __FUNCTION__

View File

@ -5,7 +5,7 @@
#include "Socket.h"
#include "client.h"
#include <p8-platform/util/util.h>
#include <libXBMC_addon.h>
#include <kodi/libXBMC_addon.h>
#include <cstring>
#include <sstream>

View File

@ -2,7 +2,7 @@
#define _RTSP_CLIENT_HPP_
#include <string>
#include <xbmc_pvr_types.h>
#include <kodi/xbmc_pvr_types.h>
bool rtsp_open(const std::string& name, const std::string& url_str);
void rtsp_close();