Skip to content

Commit 619645a

Browse files
committed
# This is a combination of 6 commits.
# This is the 1st commit message: 9 update cpp build settings and gtest compatability # This is the commit message google#2: Revert back to test suite when using a more uptodate version of gtest than supplied by apt-get # This is the commit message google#3: actually version 1.8 # This is the commit message google#4: scons instructions update # This is the commit message google#5: google#5 Now matlab scripts run correctly with modern matlab # This is the commit message google#6: Update SConstruct to be python 3 compatible.
1 parent 8257762 commit 619645a

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
*.o
22
*.a
3-
*.dblite
3+
*.dblite
4+
# Matlab ASV autosave files
5+
*.asv
6+
# Pychache files
7+
*.pyc

cpp/SConstruct

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ http://llvm.org/releases/download.html instead of building it from
5858
source.)
5959
"""
6060

61-
import commands
61+
import subprocess
6262
import os
6363

6464
env = Environment(CPPPATH = [os.environ['EIGEN_PATH'],
6565
os.environ['GTEST_SOURCE'] + '/include'])
66-
GCC_VERSION = commands.getoutput(env['CXX'] + ' -dumpversion')
66+
GCC_VERSION = subprocess.getoutput(env['CXX'] + ' -dumpversion')
6767
if GCC_VERSION.startswith('4.6'):
6868
# The override keyword is not supported in GCC 4.6, so we define it away.
6969
env.MergeFlags(['-std=c++0x -Doverride='])

0 commit comments

Comments
 (0)