diff options
| author | Mathias Preiner <mathias.preiner@gmail.com> | 2018-08-20 19:39:32 -0700 |
|---|---|---|
| committer | Mathias Preiner <mathias.preiner@gmail.com> | 2018-09-22 16:30:59 -0700 |
| commit | 6f219294f25cb675caeb5c846f201c22255b50c7 (patch) | |
| tree | 4c4c573e21eb286997555d1e775d178ad9cf5b0f | |
| parent | 6c21382d9fab8ab0fcb8e994554b079bdc2870a1 (diff) | |
cmake: Various portfolio/default option fixes.
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | cmake/ConfigCompetition.cmake | 5 | ||||
| -rw-r--r-- | cmake/ConfigDebug.cmake | 1 | ||||
| -rw-r--r-- | cmake/ConfigProduction.cmake | 2 | ||||
| -rw-r--r-- | cmake/ConfigTesting.cmake | 4 |
5 files changed, 13 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2898f9dff..36c372652 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -226,6 +226,13 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "Competition") 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 enable_testing() @@ -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 3741d027f..8c2fda2d4 100644 --- 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 8ef93d111..9decc07be 100644 --- 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 dc3305166..336e582b9 100644 --- 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 5b6c46ebb..7b948084f 100644 --- 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) |