Merge pull request #137 from saxbophone/develop

v0.21.1

Author: saxbophone

.travis.yml

@@ -1,18 +1,21 @@
 language: c
+# Ubuntu 14.04 Trusty support
+sudo: required
+dist: trusty
 # build matrix with both OSes and Compilers
 os:
   - linux
   - osx
 compiler:
   - clang
-  # commenting out gcc until installing GCC v5.x+ actually works on Travis CI
-  # - gcc
+  - gcc
 # different C Standard versions - test on C99 and C11
 env:
-  - LIBSAXBOSPIRAL_C_STANDARD=99
-  - LIBSAXBOSPIRAL_C_STANDARD=11
-# exclude gcc on osx as this always points to clang
+  matrix:
+    - LIBSAXBOSPIRAL_C_STANDARD=99
+    - LIBSAXBOSPIRAL_C_STANDARD=11
 matrix:
+  # exclude gcc on osx as this always points to clang
   exclude:
   - os: osx
     compiler: gcc
@@ -22,18 +25,22 @@ addons:
   apt:
     sources:
       - george-edison55-precise-backports # cmake 3.2.3 / doxygen 1.8.3
+      # add PPAs with more up-to-date toolchains
+      - ubuntu-toolchain-r-test
     packages:
       - cmake
       - cmake-data
-      # commenting out gcc until installing GCC v5.x+ actually works on Travis CI
       # want gcc 5.x as 4.x gives incorrect warnings
-      # - gcc-5
+      - gcc-5
 # branches safelist
 branches:
   only:
     - master
     - develop
     - /^test\/.*$/
+install:
+  # override $CC to use gcc-5
+  - if [ "$CC" = "gcc" ]; then export CC="gcc-5"; fi
 before_script:
   - cmake .
 script:

CMakeLists.txt

@@ -23,10 +23,12 @@
 # begin basic metadata
 cmake_minimum_required(VERSION 3.0)
 
-project(libsaxbospiral VERSION 0.21.0 LANGUAGES C)
+project(libsaxbospiral VERSION 0.21.1 LANGUAGES C)
 
-# set default C standard to use (C99)
-set(SAXBOSPIRAL_C_STANDARD "99")
+# set default C standard to use (C99) if not already set
+if(NOT DEFINED SAXBOSPIRAL_C_STANDARD)
+    set(SAXBOSPIRAL_C_STANDARD "99")
+endif()
 # if env variable LIBSAXBOSPIRAL_C_STANDARD is set and valid, override version
 if(DEFINED ENV{LIBSAXBOSPIRAL_C_STANDARD})
     # not a very robust regex but ok for most purposes

README.md

@@ -61,11 +61,17 @@ cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON .
 make
 ```
 
-The above builds in C99 mode by default. The standard to use is controlled by the `LIBSAXBOSPIRAL_C_STANDARD` environment variable.
+The above builds in C99 mode by default. The standard to use can be controlled by the `SAXBOSPIRAL_C_STANDARD` CMake variable or by the `LIBSAXBOSPIRAL_C_STANDARD` environment variable.
 
-You can build in C11 mode if you want with the following:
+You can build in C11 mode if you want with either of the following:
 
 ```sh
+# using CMake variable
+cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DSAXBOSPIRAL_C_STANDARD=11 .
+```
+
+```sh
+# using environment variable
 LIBSAXBOSPIRAL_C_STANDARD=11 cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON .
 ```