diff --git a/.travis.yml b/.travis.yml index 76f1c1f..61d0476 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,63 +8,74 @@ git: matrix: fast_finish: true include: - - name: Ubuntu CMake dll + - name: Ubuntu qmake dll os: linux dist: xenial group: stable - cache: ccache addons: apt: + sources: + - ubuntu-toolchain-r-test + - sourceline: 'ppa:beineri/opt-qt-5.12.0-xenial' + update: true packages: - - qt5-default - - qttools5-dev - - qttools5-dev-tools + - qt512base + - qt512tools + - gcc-6 + - g++-6 + - libc6-i386 + - libgl-dev + - libgl1-mesa-dev + - mesa-common-dev script: - - mkdir .\build - - cd build - - cmake --version - - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_EXAMPLES=ON -DBUILD_STATIC=OFF -DCMAKE_INSTALL_PREFIX="./installed" ../ - - cmake --build . - - cmake --build . --target install - - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=OFF -DCMAKE_INSTALL_PREFIX="./installed" ../ - - cmake --build . - - cmake --build . --target install - - name: Ubuntu CMake static + - PATH="/opt/qt512/bin:$PATH" + - CXX="g++-6" + - CC="gcc-6" + - qt512-env.sh + - qmake + - make + - make install + - name: Ubuntu qmake static os: linux dist: xenial group: stable - cache: ccache addons: apt: + sources: + - ubuntu-toolchain-r-test + - sourceline: 'ppa:beineri/opt-qt-5.12.0-xenial' + update: true packages: - - qt5-default - - qttools5-dev - - qttools5-dev-tools + - qt512base + - qt512tools + - gcc-6 + - g++-6 + - libc6-i386 + - libgl-dev + - libgl1-mesa-dev + - mesa-common-dev script: - - mkdir .\build - - cd build - - cmake --version - - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_EXAMPLES=ON -DBUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX="./installed" ../ - - cmake --build . - - cmake --build . --target install - - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX="./installed" ../ - - cmake --build . - - cmake --build . --target install - + - PATH="/opt/qt512/bin:$PATH" + - CXX="g++-6" + - CC="gcc-6" + - qt512-env.sh + - qmake "CONFIG+=adsBuildStatic" + - make + - make install - name: macOS CMake dll os: osx osx_image: xcode10.1 - cache: ccache addons: homebrew: packages: - - ccache - qt + update: true script: - - mkdir .\build + - PATH="/usr/local/opt/qt5/bin:$PATH" + - mkdir -p build - cd build - 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 . --target install - 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 os: osx osx_image: xcode10.1 - cache: ccache addons: homebrew: packages: - - ccache - qt + update: true script: - - mkdir .\build + - PATH="/usr/local/opt/qt5/bin:$PATH" + - mkdir -p build - cd build - 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 . --target install - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX="./installed" ../ - cmake --build . - 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: email: false diff --git a/demo/demo.pro b/demo/demo.pro index 4d6eae1..5444514 100644 --- a/demo/demo.pro +++ b/demo/demo.pro @@ -4,6 +4,7 @@ TARGET = AdvancedDockingSystemDemo DESTDIR = $${ADS_OUT_ROOT}/lib QT += core gui widgets CONFIG += c++11 +CONFIG += debug_and_release DEFINES += QT_DEPRECATED_WARNINGS adsBuildStatic { diff --git a/example/example.pro b/example/example.pro index b1a26e6..1245326 100644 --- a/example/example.pro +++ b/example/example.pro @@ -6,6 +6,7 @@ TARGET = Example1 DESTDIR = $${ADS_OUT_ROOT}/lib TEMPLATE = app CONFIG += c++11 +CONFIG += debug_and_release adsBuildStatic { DEFINES += ADS_STATIC } diff --git a/src/src.pro b/src/src.pro index 513ef3b..5703459 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,5 +1,6 @@ ADS_OUT_ROOT = $${OUT_PWD}/.. CONFIG += c++11 +CONFIG += debug_and_release TARGET = $$qtLibraryTarget(qtadvanceddocking) DEFINES += QT_DEPRECATED_WARNINGS TEMPLATE = lib