merge

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

src/solver/CMakeLists.txt

@@ -0,0 +1,16 @@
+z3_add_component(solver
+  SOURCES
+    check_sat_result.cpp
+    combined_solver.cpp
+    mus.cpp
+    smt_logics.cpp
+    solver.cpp
+    solver_na2as.cpp
+    solver2tactic.cpp
+    tactic2solver.cpp
+  COMPONENT_DEPENDENCIES
+    model
+    tactic
+  PYG_FILES
+    combined_solver_params.pyg
+)