diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2014-06-10 17:52:26 -0400 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2014-06-11 16:18:23 -0400 |
| commit | 6f1454d2082d4e8783c3b35c30144ff557b99444 (patch) | |
| tree | 3339ec7eb47f5aa272fbe1511e1036e9790d0507 /src/util | |
| parent | 3c2458b633501345fba2679c611ce9e5c7a9f538 (diff) | |
Some clean-up, post bv-merge.
Add abc to build id and fix static building.
Add abc to --show-config output and Configuration class API.
Add ability to select abc source path.
Fix arch_flags for abc.
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/configuration.cpp | 6 | ||||
| -rw-r--r-- | src/util/configuration.h | 4 | ||||
| -rw-r--r-- | src/util/configuration_private.h | 8 |
3 files changed, 15 insertions, 3 deletions
diff --git a/src/util/configuration.cpp b/src/util/configuration.cpp index 0d22325e7..05f5c7678 100644 --- a/src/util/configuration.cpp +++ b/src/util/configuration.cpp @@ -5,7 +5,7 @@ ** Major contributors: none ** Minor contributors (to current version): Liana Hadarean, Tim King, ACSYS, Christopher L. Conway, Dejan Jovanovic, Francois Bobot ** This file is part of the CVC4 project. - ** Copyright (c) 2009-2013 New York University and The University of Iowa + ** Copyright (c) 2009-2014 New York University and The University of Iowa ** See the file COPYING in the top-level source directory for licensing ** information.\endverbatim ** @@ -125,6 +125,10 @@ bool Configuration::isBuiltWithGlpk() { return IS_GLPK_BUILD; } +bool Configuration::isBuiltWithAbc() { + return IS_ABC_BUILD; +} + bool Configuration::isBuiltWithCudd() { return false; } diff --git a/src/util/configuration.h b/src/util/configuration.h index 696b67715..c6562b3e6 100644 --- a/src/util/configuration.h +++ b/src/util/configuration.h @@ -5,7 +5,7 @@ ** Major contributors: none ** Minor contributors (to current version): ACSYS, Liana Hadarean, Tim King, Francois Bobot ** This file is part of the CVC4 project. - ** Copyright (c) 2009-2013 New York University and The University of Iowa + ** Copyright (c) 2009-2014 New York University and The University of Iowa ** See the file COPYING in the top-level source directory for licensing ** information.\endverbatim ** @@ -91,6 +91,8 @@ public: static bool isBuiltWithGlpk(); + static bool isBuiltWithAbc(); + static bool isBuiltWithReadline(); static bool isBuiltWithCudd(); diff --git a/src/util/configuration_private.h b/src/util/configuration_private.h index 07ab4b17e..631a323d3 100644 --- a/src/util/configuration_private.h +++ b/src/util/configuration_private.h @@ -5,7 +5,7 @@ ** Major contributors: ACSYS, Morgan Deters ** Minor contributors (to current version): Liana Hadarean, Tim King ** This file is part of the CVC4 project. - ** Copyright (c) 2009-2013 New York University and The University of Iowa + ** Copyright (c) 2009-2014 New York University and The University of Iowa ** See the file COPYING in the top-level source directory for licensing ** information.\endverbatim ** @@ -107,6 +107,12 @@ namespace CVC4 { # define IS_GLPK_BUILD false #endif /* CVC4_USE_GLPK */ +#if CVC4_USE_ABC +# define IS_ABC_BUILD true +#else /* CVC4_USE_ABC */ +# define IS_ABC_BUILD false +#endif /* CVC4_USE_ABC */ + #ifdef HAVE_LIBREADLINE # define IS_READLINE_BUILD true #else /* HAVE_LIBREADLINE */ |