Merge pull request #136 from rodluger/c++11

C++11

.ci/travis.sh

@@ -25,4 +25,4 @@ fi
 conda info -a
 
 # Build the code
-CC=gcc-5 && CXX=g++-5 python setup.py develop
+CC=gcc-4.8 && CXX=g++-4.8 python setup.py develop

.travis.yml

@@ -10,8 +10,8 @@ addons:
         sources:
             - ubuntu-toolchain-r-test
         packages:
-            - gcc-5
-            - g++-5
+            - gcc-4.8
+            - g++-4.8
 
 matrix:
     include:

HISTORY.rst

@@ -1,6 +1,6 @@
 .. :changelog:
 
-0.1.0 (2018-07-13)
+0.1.2 (2018-07-15)
 ++++++++++++++++++
 
 - Initial stable beta release of the code for submission to ApJ.

setup.py

@@ -5,7 +5,7 @@
 import os
 import glob
 import setuptools
-__version__ = '0.1.1'
+__version__ = '0.1.2'
 
 
 # Custom compiler flags
@@ -26,8 +26,9 @@
     macros['STARRY_NGRAD'] = int(macros['STARRY_NGRAD']) + 1
 
 # Enable optimization?
-optimize = True
-if (os.getenv('STARRY_NO_OPT', 0)):
+if int(os.getenv('STARRY_OPT', 1)):
+    optimize = True
+else:
     optimize = False
 
 
@@ -107,10 +108,16 @@ def build_extensions(self):
         """Build the extensions."""
         ct = self.compiler.compiler_type
         opts = self.c_opts.get(ct, [])
+        if not any(f.startswith("-std=") for f in opts):
+            if has_flag(self.compiler, "-std=c++14"):
+                opts.append('-std=c++14')
+            elif has_flag(self.compiler, "-std=c++11"):
+                opts.append('-std=c++11')
+            else:
+                raise RuntimeError("C++11 or 14 is required to compile starry")
         if ct == 'unix':
             opts.append('-DVERSION_INFO="%s"' %
                         self.distribution.get_version())
-            opts.append('-std=c++14')
             if has_flag(self.compiler, '-fvisibility=hidden'):
                 opts.append('-fvisibility=hidden')
         elif ct == 'msvc':