fixed travis script

This commit is contained in:
Luca Beldi 2019-01-18 08:33:11 +00:00
parent 7dd2a3c83c
commit ee616c2541
4 changed files with 77 additions and 38 deletions

View File

@ -8,63 +8,74 @@ git:
matrix: matrix:
fast_finish: true fast_finish: true
include: include:
- name: Ubuntu CMake dll - name: Ubuntu qmake dll
os: linux os: linux
dist: xenial dist: xenial
group: stable group: stable
cache: ccache
addons: addons:
apt: apt:
sources:
- ubuntu-toolchain-r-test
- sourceline: 'ppa:beineri/opt-qt-5.12.0-xenial'
update: true
packages: packages:
- qt5-default - qt512base
- qttools5-dev - qt512tools
- qttools5-dev-tools - gcc-6
- g++-6
- libc6-i386
- libgl-dev
- libgl1-mesa-dev
- mesa-common-dev
script: script:
- mkdir .\build - PATH="/opt/qt512/bin:$PATH"
- cd build - CXX="g++-6"
- cmake --version - CC="gcc-6"
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_EXAMPLES=ON -DBUILD_STATIC=OFF -DCMAKE_INSTALL_PREFIX="./installed" ../ - qt512-env.sh
- cmake --build . - qmake
- cmake --build . --target install - make
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=OFF -DCMAKE_INSTALL_PREFIX="./installed" ../ - make install
- cmake --build . - name: Ubuntu qmake static
- cmake --build . --target install
- name: Ubuntu CMake static
os: linux os: linux
dist: xenial dist: xenial
group: stable group: stable
cache: ccache
addons: addons:
apt: apt:
sources:
- ubuntu-toolchain-r-test
- sourceline: 'ppa:beineri/opt-qt-5.12.0-xenial'
update: true
packages: packages:
- qt5-default - qt512base
- qttools5-dev - qt512tools
- qttools5-dev-tools - gcc-6
- g++-6
- libc6-i386
- libgl-dev
- libgl1-mesa-dev
- mesa-common-dev
script: script:
- mkdir .\build - PATH="/opt/qt512/bin:$PATH"
- cd build - CXX="g++-6"
- cmake --version - CC="gcc-6"
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_EXAMPLES=ON -DBUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX="./installed" ../ - qt512-env.sh
- cmake --build . - qmake "CONFIG+=adsBuildStatic"
- cmake --build . --target install - make
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX="./installed" ../ - make install
- cmake --build .
- cmake --build . --target install
- name: macOS CMake dll - name: macOS CMake dll
os: osx os: osx
osx_image: xcode10.1 osx_image: xcode10.1
cache: ccache
addons: addons:
homebrew: homebrew:
packages: packages:
- ccache
- qt - qt
update: true
script: script:
- mkdir .\build - PATH="/usr/local/opt/qt5/bin:$PATH"
- mkdir -p build
- cd build - cd build
- cmake --version - cmake --version
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_EXAMPLES=ON -DBUILD_STATIC=OFF -DCMAKE_INSTALL_PREFIX="./installed" ../ - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_DEBUG_POSTFIX=_debug -DBUILD_EXAMPLES=ON -DBUILD_STATIC=OFF -DCMAKE_INSTALL_PREFIX="./installed" ../
- cmake --build . - cmake --build .
- cmake --build . --target install - cmake --build . --target install
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=OFF -DCMAKE_INSTALL_PREFIX="./installed" ../ - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=OFF -DCMAKE_INSTALL_PREFIX="./installed" ../
@ -73,23 +84,48 @@ matrix:
- name: macOS CMake static - name: macOS CMake static
os: osx os: osx
osx_image: xcode10.1 osx_image: xcode10.1
cache: ccache
addons: addons:
homebrew: homebrew:
packages: packages:
- ccache
- qt - qt
update: true
script: script:
- mkdir .\build - PATH="/usr/local/opt/qt5/bin:$PATH"
- mkdir -p build
- cd build - cd build
- cmake --version - cmake --version
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_EXAMPLES=ON -DBUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX="./installed" ../ - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_DEBUG_POSTFIX=_debug -DBUILD_EXAMPLES=ON -DBUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX="./installed" ../
- cmake --build . - cmake --build .
- cmake --build . --target install - cmake --build . --target install
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX="./installed" ../ - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX="./installed" ../
- cmake --build . - cmake --build .
- cmake --build . --target install - cmake --build . --target install
- name: macOS qmake dll
os: osx
osx_image: xcode10.1
addons:
homebrew:
packages:
- qt
update: true
script:
- PATH="/usr/local/opt/qt5/bin:$PATH"
- qmake
- make
- make install
- name: macOS qmake static
os: osx
osx_image: xcode10.1
addons:
homebrew:
packages:
- qt
update: true
script:
- PATH="/usr/local/opt/qt5/bin:$PATH"
- qmake "CONFIG+=adsBuildStatic"
- make
- make install
notifications: notifications:
email: false email: false

View File

@ -4,6 +4,7 @@ TARGET = AdvancedDockingSystemDemo
DESTDIR = $${ADS_OUT_ROOT}/lib DESTDIR = $${ADS_OUT_ROOT}/lib
QT += core gui widgets QT += core gui widgets
CONFIG += c++11 CONFIG += c++11
CONFIG += debug_and_release
DEFINES += QT_DEPRECATED_WARNINGS DEFINES += QT_DEPRECATED_WARNINGS
adsBuildStatic { adsBuildStatic {

View File

@ -6,6 +6,7 @@ TARGET = Example1
DESTDIR = $${ADS_OUT_ROOT}/lib DESTDIR = $${ADS_OUT_ROOT}/lib
TEMPLATE = app TEMPLATE = app
CONFIG += c++11 CONFIG += c++11
CONFIG += debug_and_release
adsBuildStatic { adsBuildStatic {
DEFINES += ADS_STATIC DEFINES += ADS_STATIC
} }

View File

@ -1,5 +1,6 @@
ADS_OUT_ROOT = $${OUT_PWD}/.. ADS_OUT_ROOT = $${OUT_PWD}/..
CONFIG += c++11 CONFIG += c++11
CONFIG += debug_and_release
TARGET = $$qtLibraryTarget(qtadvanceddocking) TARGET = $$qtLibraryTarget(qtadvanceddocking)
DEFINES += QT_DEPRECATED_WARNINGS DEFINES += QT_DEPRECATED_WARNINGS
TEMPLATE = lib TEMPLATE = lib