Skip to content

Commit

Permalink
# This is a combination of 6 commits.
Browse files Browse the repository at this point in the history
# 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.
  • Loading branch information
sedurCode committed Mar 1, 2021
1 parent 8257762 commit 619645a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
*.o
*.a
*.dblite
*.dblite
# Matlab ASV autosave files
*.asv
# Pychache files
*.pyc
4 changes: 2 additions & 2 deletions cpp/SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ http://llvm.org/releases/download.html instead of building it from
source.)
"""

import commands
import subprocess
import os

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

0 comments on commit 619645a

Please sign in to comment.