Commit dfe1f716 authored by Mateusz Łoskot's avatar Mateusz Łoskot

Merged revision(s) 4382-4384 from trunk:

Add indent_size = 2 for .yml files
........
Travis CI: Add ppa:george-edison55/precise-backports with CMake 3+
........
CMake: Use CMAKE_CXX_STANDARD to require C++98
........


git-svn-id: http://svn.osgeo.org/geos/branches/3.6@4385 5242fede-7e19-0410-aef8-94bd7d2200fb
parent e98273aa
Pipeline #7294124 passed with stage
in 19 minutes and 56 seconds
......@@ -23,3 +23,18 @@ indent_size = 2
# YML files want space indentation
[*.yml]
indent_style = space
indent_size = 2
# Visual-C files want carriage returns too
[*.vc]
end_of_line = crlf
# CMake configuration files
[CMakeLists.txt]
indent_style = space
indent_size = 2
# CMake modules
[*.cmake]
indent_style = space
indent_size = 2
......@@ -25,11 +25,14 @@ matrix:
addons:
apt:
sources:
- george-edison55-precise-backports
packages:
- gcc-multilib
- g++-multilib
- cmake
- make
- cmake
- cmake-data
- g++-multilib
- gcc-multilib
- make
script: ./tools/ci/script.sh
......@@ -50,4 +53,4 @@ notifications:
- https://webhooks.gitter.im/e/a38e35772d115f246fb9
on_success: always # options: [always|never|change] default: always
on_failure: always # options: [always|never|change] default: always
on_start: always # options: [always|never|change] default: always
on_start: always # options: [always|never|change] default: always
......@@ -87,6 +87,8 @@ endif()
#################################################################################
# Setup C/C++ compiler options
#################################################################################
set(CMAKE_CXX_STANDARD 98)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
if(NOT MSVC_IDE)
if(NOT CMAKE_BUILD_TYPE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment