cmake: Various portfolio/default option fixes.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2898f9dffa3ec206005d31d74c6875d8f8dae7df..36c372652c7a735d9c4373ba5595a790d06d5d56 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,6 +225,13 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "Competition")
   #TODO
 endif()
 
+#-----------------------------------------------------------------------------#
+# Option defaults (three-valued options (cvc4_option(...)))
+
+cvc4_set_option(ENABLE_PORTFOLIO OFF)
+cvc4_set_option(ENABLE_SHARED ON)
+cvc4_set_option(ENABLE_VALGRIND OFF)
+
 #-----------------------------------------------------------------------------#
 # Enable the ctest testing framework
 
@@ -267,6 +274,8 @@ endif()
 
 if(ENABLE_PORTFOLIO)
   find_package(Boost REQUIRED COMPONENTS thread)
+  # Disable CLN for portfolio builds since it is not thread safe (uses an
+  # unlocked hash table internally).
   set(USE_CLN OFF)
   set(THREADS_PREFER_PTHREAD_FLAG ON)
   find_package(Threads REQUIRED)
@@ -547,7 +556,7 @@ endif()
 #message("Bindings     : ${bindings_to_be_built}")
 #message("")
 #message("Multithreaded: ${support_multithreaded}")
-#message("Portfolio    : ${with_portfolio}")
+message("Portfolio         : ${ENABLE_PORTFOLIO}")
 message("")
 #message("ABC          : ${{with_abc}")
 message("CaDiCaL           : ${USE_CADICAL}")

diff --git a/cmake/ConfigCompetition.cmake b/cmake/ConfigCompetition.cmake
index 3741d027fcd469043ffda0c83c406c3a32f19dae..8c2fda2d45ea11fcedfad473cbba27d146f3ab84 100644 (file)
--- a/cmake/ConfigCompetition.cmake
+++ b/cmake/ConfigCompetition.cmake
@@ -16,7 +16,7 @@ cvc4_set_option(ENABLE_REPLAY OFF)
 # enable_assertions=no
 cvc4_set_option(ENABLE_ASSERTIONS OFF)
 # enable_proof=no
-cvc4_set_option(ENABLE_PROOFS, OFF)
+cvc4_set_option(ENABLE_PROOFS OFF)
 # enable_tracing=no
 cvc4_set_option(ENABLE_TRACING OFF)
 # enable_dumping=no
@@ -24,7 +24,6 @@ cvc4_set_option(ENABLE_DUMPING OFF)
 # enable_muzzle=yes
 cvc4_set_option(ENABLE_MUZZLE ON)
 # enable_valgrind=no
-cvc4_set_option(ENABLE_VALGRIND OFF)
 # enable_shared=no
+cvc4_set_option(ENABLE_SHARED OFF)
 cvc4_set_option(ENABLE_UNIT_TESTING OFF)
-cvc4_set_option(ENABLE_SHARED ON)

diff --git a/cmake/ConfigDebug.cmake b/cmake/ConfigDebug.cmake
index 8ef93d11160b68dfaf8161c7b76c7c6c1312c160..9decc07be3f067037b4010d27394894615e2b5d8 100644 (file)
--- a/cmake/ConfigDebug.cmake
+++ b/cmake/ConfigDebug.cmake
@@ -24,4 +24,3 @@ cvc4_set_option(ENABLE_DUMPING ON)
 cvc4_set_option(ENABLE_MUZZLE OFF)
 # enable_valgrind=optional
 cvc4_set_option(ENABLE_UNIT_TESTING ON)
-cvc4_set_option(ENABLE_SHARED ON)

diff --git a/cmake/ConfigProduction.cmake b/cmake/ConfigProduction.cmake
index dc33051667c5d52c2471a948a7e38914bfeabb13..336e582b91e4beb2c22d6233b4249bb3faae4ea2 100644 (file)
--- a/cmake/ConfigProduction.cmake
+++ b/cmake/ConfigProduction.cmake
@@ -20,6 +20,4 @@ cvc4_set_option(ENABLE_DUMPING ON)
 # enable_muzzle=no
 cvc4_set_option(ENABLE_MUZZLE OFF)
 # enable_valgrind=no
-cvc4_set_option(ENABLE_VALGRIND OFF)
 cvc4_set_option(ENABLE_UNIT_TESTING OFF)
-cvc4_set_option(ENABLE_SHARED ON)

diff --git a/cmake/ConfigTesting.cmake b/cmake/ConfigTesting.cmake
index 5b6c46ebb73fa78c9fd8f22ae122187250b0d362..7b948084f3f80ad84b5ff8eddc5e3d066fe0522c 100644 (file)
--- a/cmake/ConfigTesting.cmake
+++ b/cmake/ConfigTesting.cmake
@@ -12,7 +12,7 @@ cvc4_set_option(ENABLE_REPLAY ON)
 # enable_assertions=yes
 cvc4_set_option(ENABLE_ASSERTIONS ON)
 # enable_proof=yes
-cvc4_set_option(ENABLE_PROOFS, ON)
+cvc4_set_option(ENABLE_PROOFS ON)
 # enable_tracing=yes
 cvc4_set_option(ENABLE_TRACING ON)
 # enable_dumping=yes
@@ -20,6 +20,4 @@ cvc4_set_option(ENABLE_DUMPING ON)
 # enable_muzzle=no
 cvc4_set_option(ENABLE_MUZZLE OFF)
 # enable_valgrind=no
-cvc4_set_option(ENABLE_VALGRIND OFF)
 cvc4_set_option(ENABLE_UNIT_TESTING ON)
-cvc4_set_option(ENABLE_SHARED ON)