From 0816cef518a700a1e2cf4c70a64fedc017cb0664 Mon Sep 17 00:00:00 2001 From: "Keith T. Star" Date: Thu, 7 Jan 2016 08:52:40 -0800 Subject: [PATCH] Yet another Travis CMake fix because CMake versions across operating systems in isconsistent. Not in love with Travis any longer. --- CMakeLists.txt | 2 +- externals/geoflow_c | 2 +- tests/apbs_tester.py | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a27955..fd8334c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.0) +cmake_minimum_required (VERSION 2.8.7) ################################################################################ # TODO: Add licensing and authorship information diff --git a/externals/geoflow_c b/externals/geoflow_c index f34f555..e4021a2 160000 --- a/externals/geoflow_c +++ b/externals/geoflow_c @@ -1 +1 @@ -Subproject commit f34f5555876ca510975bd1de4c2a1c64ebfa6dac +Subproject commit e4021a2aa0b94f08193d6654af123f6413753116 diff --git a/tests/apbs_tester.py b/tests/apbs_tester.py index ab3352b..d299571 100644 --- a/tests/apbs_tester.py +++ b/tests/apbs_tester.py @@ -238,6 +238,12 @@ def main(): '-l', '--log_file', dest='log_file', type='string', default='test.log', help="Save the test log to FILE.", metavar="FILE" ) + + parser.add_option('-b', '--benchmark', + action='store_const', const=1, dest='benchmark', + help="Perform benchmarking." + ) + # Parse the command line and extract option values ( options, args ) = parser.parse_args()