merge

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

src/sat/CMakeLists.txt

@@ -0,0 +1,33 @@
+z3_add_component(sat
+  SOURCES
+    ba_solver.cpp
+    dimacs.cpp
+    sat_asymm_branch.cpp
+    sat_ccc.cpp
+    sat_clause.cpp
+    sat_clause_set.cpp
+    sat_clause_use_list.cpp
+    sat_cleaner.cpp
+    sat_config.cpp
+    sat_drat.cpp
+    sat_elim_eqs.cpp
+    sat_iff3_finder.cpp
+    sat_integrity_checker.cpp
+    sat_local_search.cpp
+    sat_lookahead.cpp
+    sat_model_converter.cpp
+    sat_mus.cpp
+    sat_parallel.cpp
+    sat_probing.cpp
+    sat_scc.cpp
+    sat_simplifier.cpp
+    sat_solver.cpp
+    sat_watched.cpp
+  COMPONENT_DEPENDENCIES
+    util
+  PYG_FILES
+    sat_asymm_branch_params.pyg
+    sat_params.pyg
+    sat_scc_params.pyg
+    sat_simplifier_params.pyg
+)