[geos-commits] r4385 - branches/3.6
Mateusz Loskot
mateusz at loskot.net
Tue Mar 28 07:26:49 PDT 2017
Author: mloskot
Date: 2017-03-28 07:26:49 -0700 (Tue, 28 Mar 2017)
New Revision: 4385
Modified:
branches/3.6/
branches/3.6/.editorconfig
branches/3.6/.travis.yml
branches/3.6/CMakeLists.txt
Log:
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
........
Property changes on: branches/3.6
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.4:4056
/branches/3.5:4210
/trunk:4340,4343-4356,4358,4360,4362,4364-4365,4380
+ /branches/3.4:4056
/branches/3.5:4210
/trunk:4340,4343-4356,4358,4360,4362,4364-4365,4380,4382-4384
Modified: branches/3.6/.editorconfig
===================================================================
--- branches/3.6/.editorconfig 2017-03-28 14:05:29 UTC (rev 4384)
+++ branches/3.6/.editorconfig 2017-03-28 14:26:49 UTC (rev 4385)
@@ -23,3 +23,18 @@
# 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
Modified: branches/3.6/.travis.yml
===================================================================
--- branches/3.6/.travis.yml 2017-03-28 14:05:29 UTC (rev 4384)
+++ branches/3.6/.travis.yml 2017-03-28 14:26:49 UTC (rev 4385)
@@ -25,11 +25,14 @@
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 @@
- 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
Modified: branches/3.6/CMakeLists.txt
===================================================================
--- branches/3.6/CMakeLists.txt 2017-03-28 14:05:29 UTC (rev 4384)
+++ branches/3.6/CMakeLists.txt 2017-03-28 14:26:49 UTC (rev 4385)
@@ -87,6 +87,8 @@
#################################################################################
# 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)
More information about the geos-commits
mailing list