Use SMT-COMP configuration for competition build (#4995)

This commit changes our `competition` build to include the libraries
that we have used for SMT-COMP by default. This makes it easier for
users to reproduce our SMT-COMP configuration for performance
measurements. We are using GPL libraries for this build type, so the
commit adds color to highlight the fact that this build type produces a
GPL build.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02933762b846111f09436aa3a5aa158e8d534acb..06e9c44f6985d8a2bc899473e18b8df8adfc4b38 100644 (file)
--- 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:"

diff --git a/NEWS b/NEWS
index f74fe2631f135afef88eed439430b7c0c4916356..d3e519c9bf32946067b0d5fff9a0547ac01ca7b2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 e18d2b2f1b212ef206659313feda31dec179815e..d7188f60a85d104f03b7d356e79d8adc7d074ac7 100644 (file)
--- 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 692e3290014c561ade53996059faf5d175eb73c3..79c8f7bf228ee7fc4421c80c013015f991cbf294 100644 (file)
--- 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)