fix: dev: add latest module to cmake build modules

* correct the cadical usage of __USE_MINGW_ANSI_STDIO

Signed-off-by: Stephen L Arnold <[email protected]>

Author: sarnold

CMakeLists.txt

@@ -117,7 +117,7 @@ set(ABC_MODULES
     src/opt/ret src/opt/fret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt src/opt/rar
     src/opt/cgt src/opt/csw src/opt/dar src/opt/dau src/opt/dsc src/opt/sfm src/opt/sbd
     src/sat/bsat src/sat/xsat src/sat/satoko src/sat/csat src/sat/msat src/sat/psat
-    src/sat/cnf src/sat/bmc src/sat/glucose src/sat/glucose2 src/sat/kissat
+    src/sat/cnf src/sat/bmc src/sat/glucose src/sat/glucose2 src/sat/kissat src/sat/cadical
     src/bool/bdc src/bool/deco src/bool/dec src/bool/kit src/bool/lucky
     src/bool/rsb src/bool/rpo
     src/proof/pdr src/proof/abs src/proof/live src/proof/ssc src/proof/int

src/sat/cadical/CMakeLists.txt

@@ -0,0 +1,95 @@
+abc_libabc_add_sources(
+    NAME sat_cadical
+    SOURCES
+        cadical_drattracer.cpp
+        cadical_restart.cpp
+        cadical_lidruptracer.cpp
+        cadical_ternary.cpp
+        cadical_options.cpp
+        cadical_constrain.cpp
+        cadical_minimize.cpp
+        cadical_logging.cpp
+        cadical_restore.cpp
+        cadical_lratchecker.cpp
+        cadical_backward.cpp
+        cadical_contract.cpp
+        cadical_watch.cpp
+        cadical_flags.cpp
+        cadical_propagate.cpp
+        cadical_veripbtracer.cpp
+        cadical_config.cpp
+        cadical_compact.cpp
+        cadical_score.cpp
+        cadical_factor.cpp
+        cadical_transred.cpp
+        cadical_report.cpp
+        cadical_signal.cpp
+        cadical_ema.cpp
+        cadical_file.cpp
+        cadical_occs.cpp
+        cadical_averages.cpp
+        cadical_rephase.cpp
+        cadical_idruptracer.cpp
+        cadical_lrattracer.cpp
+        cadical_walk.cpp
+        cadical_version.cpp
+        cadical_lucky.cpp
+        cadical_proof.cpp
+        cadical_terminal.cpp
+        cadical_external_propagate.cpp
+        cadical_definition.cpp
+        cadical_condition.cpp
+        cadical_tier.cpp
+        cadical_decompose.cpp
+        cadical_phases.cpp
+        cadical_ccadical.cpp
+        cadical_instantiate.cpp
+        cadical_shrink.cpp
+        cadical_block.cpp
+        cadical_analyze.cpp
+        cadical_elimfast.cpp
+        cadical_parse.cpp
+        cadical_queue.cpp
+        cadical_vivify.cpp
+        cadical_external.cpp
+        cadical_checker.cpp
+        cadical_clause.cpp
+        cadical_cover.cpp
+        cadical_resources.cpp
+        cadical_gates.cpp
+        cadical_sweep.cpp
+        cadical_arena.cpp
+        cadical_lookahead.cpp
+        cadical_backtrack.cpp
+        cadical_solution.cpp
+        cadical_subsume.cpp
+        cadicalTest.c
+        cadical_limit.cpp
+        cadical_collect.cpp
+        cadical_congruence.cpp
+        cadical_ipasir.cpp
+        cadical_stats.cpp
+        cadical_profile.cpp
+        cadical_extend.cpp
+        cadical_reduce.cpp
+        cadical_var.cpp
+        cadical_assume.cpp
+        cadical_unstable.cpp
+        cadical_internal.cpp
+        cadical_decide.cpp
+        cadical_deduplicate.cpp
+        cadical_format.cpp
+        cadical_util.cpp
+        cadical_frattracer.cpp
+        cadical_kitten.c
+        cadicalSolver.c
+        cadical_bins.cpp
+        cadical_probe.cpp
+        cadical_flip.cpp
+        cadical_solver.cpp
+        cadical_stable.cpp
+        cadical_elim.cpp
+        cadical_random.cpp
+        cadical_reap.cpp
+        cadical_message.cpp
+)

src/sat/cadical/cadical.hpp

@@ -486,8 +486,8 @@ class Solver {
 
   // Returns
   //
-  //    0 = UNKNOWN      (unit propagation did not lead to a conflict nor to a 
-  //                      complete assignment, or limit reached or interrupted 
+  //    0 = UNKNOWN      (unit propagation did not lead to a conflict nor to a
+  //                      complete assignment, or limit reached or interrupted
   //                      through 'terminate')
   //   10 = SATISFIABLE
   //   20 = UNSATISFIABLE
@@ -1083,6 +1083,7 @@ class Solver {
 
 #ifndef PRINTF_FORMAT
 #ifdef __MINGW32__
+#undef __USE_MINGW_ANSI_STDIO
 #define __USE_MINGW_ANSI_STDIO 1
 #define PRINTF_FORMAT __MINGW_PRINTF_FORMAT
 #else

src/sat/cadical/inttypes.hpp

@@ -18,6 +18,7 @@
 
 #ifndef PRINTF_FORMAT
 #ifdef __MINGW32__
+#undef __USE_MINGW_ANSI_STDIO
 #define __USE_MINGW_ANSI_STDIO 1
 #define PRINTF_FORMAT __MINGW_PRINTF_FORMAT
 #else