diff options
| author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2020-09-02 16:02:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-02 16:02:41 -0500 |
| commit | 2d6d62b7bc0c15a44b38641a52ba389591ecc7f6 (patch) | |
| tree | e11ae0a24c157cf01dbcf287727240b4e75b7b8a /cmake | |
| parent | dba70e10ef8ae0a991969cb7ca0cba2d0e9d9d4d (diff) | |
| parent | 0f9fb31069d51e003a39b0e93f506324dec2bdac (diff) | |
Merge branch 'master' into fixCMSBuildPRfixCMSBuildPR
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CVC4Config.cmake.in | 5 | ||||
| -rw-r--r-- | cmake/ConfigCompetition.cmake | 10 | ||||
| -rw-r--r-- | cmake/Helpers.cmake | 6 |
3 files changed, 19 insertions, 2 deletions
diff --git a/cmake/CVC4Config.cmake.in b/cmake/CVC4Config.cmake.in index 76535762d..7f6a80995 100644 --- a/cmake/CVC4Config.cmake.in +++ b/cmake/CVC4Config.cmake.in @@ -1,7 +1,8 @@ @PACKAGE_INIT@ -set(CVC4_BINDINGS_JAVA @BUILD_SWIG_BINDINGS_JAVA@) -set(CVC4_BINDINGS_PYTHON @BUILD_SWIG_BINDINGS_PYTHON@) +set(CVC4_BINDINGS_JAVA @BUILD_BINDINGS_JAVA@) +set(CVC4_BINDINGS_PYTHON @BUILD_BINDINGS_PYTHON@) +set(CVC4_BINDINGS_PYTHON_VERSION @BUILD_BINDINGS_PYTHON_VERSION@) if(NOT TARGET CVC4::cvc4) include(${CMAKE_CURRENT_LIST_DIR}/CVC4Targets.cmake) diff --git a/cmake/ConfigCompetition.cmake b/cmake/ConfigCompetition.cmake index e18d2b2f1..d7188f60a 100644 --- a/cmake/ConfigCompetition.cmake +++ b/cmake/ConfigCompetition.cmake @@ -22,3 +22,13 @@ cvc4_set_option(ENABLE_MUZZLE ON) # enable_shared=no cvc4_set_option(ENABLE_SHARED OFF) cvc4_set_option(ENABLE_UNIT_TESTING OFF) + +# By default, we include all dependencies in our competition build that are +# required to achieve the best performance +set(ENABLE_GPL ON) +cvc4_set_option(USE_CADICAL ON) +cvc4_set_option(USE_CLN ON) +cvc4_set_option(USE_CRYPTOMINISAT ON) +cvc4_set_option(USE_EDITLINE OFF) +cvc4_set_option(USE_GLPK ON) +cvc4_set_option(USE_SYMFPU ON) diff --git a/cmake/Helpers.cmake b/cmake/Helpers.cmake index 692e32900..79c8f7bf2 100644 --- a/cmake/Helpers.cmake +++ b/cmake/Helpers.cmake @@ -1,6 +1,12 @@ include(CheckCCompilerFlag) include(CheckCXXCompilerFlag) +if(NOT WIN32) + string(ASCII 27 Esc) + set(Yellow "${Esc}[33m") + set(ResetColor "${Esc}[m") +endif() + # Add a C flag to the global list of C flags. macro(add_c_flag flag) if(CMAKE_C_FLAGS) |