diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | cmake/ConfigCompetition.cmake | 10 | ||||
| -rw-r--r-- | cmake/Helpers.cmake | 6 |
4 files changed, 19 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 02933762b..06e9c44f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -768,7 +768,7 @@ message("") if(GPL_LIBS) message( - "CVC4 license : GPLv3 (due to optional libraries; see below)" + "CVC4 license : ${Yellow}GPLv3 (due to optional libraries; see below)${ResetColor}" "\n" "\n" "Please note that CVC4 will be built against the following GPLed libraries:" @@ -22,6 +22,8 @@ Changes: BSD-licensed Editline. Compiling with `--best` now enables Editline, instead of Readline. Without selecting optional GPL components, Editline-enabled CVC4 builds will be BSD licensed. +* The `competition` build type includes the dependencies used for SMT-COMP by + default. Note that this makes this build type produce GPL-licensed binaries. Changes since 1.7 ================= 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) |