cmake: Remove unused ENABLE_OPTIMIZED option. (#3749)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5d0cf0e5e231a2b3895632e94e039430d5c46bc..1582a3bde9adb36d2d5c90f0dc2811f51412ab99 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,7 +120,6 @@ cvc4_option(ENABLE_COMP_INC_TRACK
 cvc4_option(ENABLE_DEBUG_SYMBOLS  "Enable debug symbols")
 cvc4_option(ENABLE_DUMPING        "Enable dumping")
 cvc4_option(ENABLE_MUZZLE         "Suppress ALL non-result output")
-cvc4_option(ENABLE_OPTIMIZED      "Enable optimization")
 cvc4_option(ENABLE_PROOFS         "Enable proof support")
 cvc4_option(ENABLE_REPLAY         "Enable the replay feature")
 cvc4_option(ENABLE_STATISTICS     "Enable statistics")
@@ -588,7 +587,6 @@ endif()
 message("")
 print_config("GPL                  :" ENABLE_GPL)
 print_config("Best configuration   :" ENABLE_BEST)
-print_config("Optimized            :" ENABLE_OPTIMIZED)
 print_config("Optimization level   :" OPTIMIZATION_LEVEL)
 message("")
 print_config("Assertions           :" ENABLE_ASSERTIONS)

diff --git a/cmake/ConfigCompetition.cmake b/cmake/ConfigCompetition.cmake
index f40cd46bed3fc958ed4077404e3c39e98f78af71..6bd846d0cef67e5c490ee16cc0e458b0f19f5fdc 100644 (file)
--- a/cmake/ConfigCompetition.cmake
+++ b/cmake/ConfigCompetition.cmake
@@ -3,8 +3,6 @@ add_check_c_cxx_flag("-funroll-all-loops")
 add_check_c_cxx_flag("-fexpensive-optimizations")
 add_check_c_cxx_flag("-fno-enforce-eh-specs")
 # OPTLEVEL=9
-# enable_optimized=yes
-cvc4_set_option(ENABLE_OPTIMIZED ON)
 set(OPTIMIZATION_LEVEL 9)
 # enable_debug_symbols=no
 cvc4_set_option(ENABLE_DEBUG_SYMBOLS OFF)

diff --git a/cmake/ConfigDebug.cmake b/cmake/ConfigDebug.cmake
index 9f58d35480a6aca230bd8e5c174d83530113452d..31b142ffca5e9b74e679225e711380c1c8abff30 100644 (file)
--- a/cmake/ConfigDebug.cmake
+++ b/cmake/ConfigDebug.cmake
@@ -1,8 +1,6 @@
 add_definitions(-DCVC4_DEBUG)
 set(CVC4_DEBUG 1)
 add_check_c_cxx_flag("-fno-inline")
-# enable_optimized=no
-cvc4_set_option(ENABLE_OPTIMIZED OFF)
 set(OPTIMIZATION_LEVEL 0)
 add_c_cxx_flag("-Og")
 # enable_debug_symbols=yes

diff --git a/cmake/ConfigProduction.cmake b/cmake/ConfigProduction.cmake
index 1b30dc1aa97130fe4cccd09c97d7941f67018842..49e338abf92e0f5f14a3251f458d7814d432cd66 100644 (file)
--- a/cmake/ConfigProduction.cmake
+++ b/cmake/ConfigProduction.cmake
@@ -1,6 +1,4 @@
 # OPTLEVEL=3
-# enable_optimized=yes
-cvc4_set_option(ENABLE_OPTIMIZED ON)
 set(OPTIMIZATION_LEVEL 3)
 # enable_debug_symbols=no
 cvc4_set_option(ENABLE_DEBUG_SYMBOLS OFF)

diff --git a/cmake/ConfigTesting.cmake b/cmake/ConfigTesting.cmake
index 9627bcd5262ccb28550281c78962ebe8f29f6900..40366495dd0c159dab41cad295967f33721cf432 100644 (file)
--- a/cmake/ConfigTesting.cmake
+++ b/cmake/ConfigTesting.cmake
@@ -1,6 +1,4 @@
 # OPTLEVEL=2
-# enable_optimized=yes
-cvc4_set_option(ENABLE_OPTIMIZED ON)
 set(OPTIMIZATION_LEVEL 2)
 # enable_debug_symbols=yes
 cvc4_set_option(ENABLE_DEBUG_SYMBOLS ON)