mirror of
https://github.com/sqlitebrowser/sqlitebrowser.git
synced 2026-01-19 10:20:17 -06:00
travis: Fix building
This commit is contained in:
27
.travis.yml
27
.travis.yml
@@ -1,7 +1,25 @@
|
||||
language: cpp
|
||||
compiler:
|
||||
- gcc
|
||||
- clang
|
||||
|
||||
matrix:
|
||||
fast_finish: true
|
||||
include:
|
||||
- compiler: gcc
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
packages:
|
||||
- g++-5
|
||||
env: COMPILER=g++-5 CXX=g++-5
|
||||
- compiler: clang
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-precise-3.7
|
||||
packages:
|
||||
- clang-3.7
|
||||
env: COMPILER=clang++-3.7
|
||||
|
||||
before_install:
|
||||
- sudo add-apt-repository ppa:likemartinma/devel -y
|
||||
@@ -20,9 +38,6 @@ script:
|
||||
- make
|
||||
- ctest -V
|
||||
|
||||
matrix:
|
||||
fast_finish: true
|
||||
|
||||
notifications:
|
||||
email:
|
||||
recipients:
|
||||
|
||||
@@ -10,6 +10,7 @@ if(NOT CMAKE_BUILD_TYPE)
|
||||
set(CMAKE_BUILD_TYPE "Release")
|
||||
endif()
|
||||
|
||||
add_definitions(-std=c++11)
|
||||
|
||||
if(WIN32 AND MSVC)
|
||||
if(CMAKE_CL_64)
|
||||
@@ -206,7 +207,6 @@ else()
|
||||
QT4_ADD_RESOURCES(SQLB_RESOURCES_RCC ${SQLB_RESOURCES})
|
||||
endif()
|
||||
|
||||
|
||||
#icon and correct libs/subsystem for windows
|
||||
if(WIN32)
|
||||
#enable version check for windows
|
||||
|
||||
@@ -9,7 +9,7 @@ CONFIG += debug_and_release
|
||||
CONFIG += qt
|
||||
CONFIG += warn_on
|
||||
|
||||
QMAKE_CXXFLAGS += -std=c++14
|
||||
QMAKE_CXXFLAGS += -std=c++11
|
||||
|
||||
# create a unittest option
|
||||
CONFIG(unittest) {
|
||||
|
||||
Reference in New Issue
Block a user