try to fix build

src/CMakeLists.txt

@@ -41,8 +41,6 @@ add_subdirectory(math/hilbert)
 add_subdirectory(math/simplex)
 add_subdirectory(math/interval)
 add_subdirectory(math/bigfix)
-add_subdirectory(math/polysat)
-add_subdirectory(math/polysat/univariate)
 add_subdirectory(math/automata)
 add_subdirectory(math/realclosure)
 add_subdirectory(math/subpaving)
@@ -65,6 +63,8 @@ add_subdirectory(math/subpaving/tactic)
 add_subdirectory(tactic/aig)
 add_subdirectory(tactic/arith)
 add_subdirectory(solver)
+add_subdirectory(math/polysat/univariate)
+add_subdirectory(math/polysat)
 add_subdirectory(cmd_context)
 add_subdirectory(cmd_context/extra_cmds)
 add_subdirectory(parsers/smt2)

src/math/polysat/CMakeLists.txt

@@ -30,6 +30,7 @@ z3_add_component(polysat
     simplex
     interval
     bigfix
+    polysat_univariate_solver
   PYG_FILES
     polysat_params.pyg
 )

src/math/polysat/univariate/CMakeLists.txt

@@ -1,4 +1,7 @@
 z3_add_component(polysat_univariate_solver
   SOURCES
     univariate_solver.cpp
+  COMPONENT_DEPENDENCIES
+    util
+    solver
 )

src/math/polysat/univariate/univariate_solver.cpp

@@ -17,8 +17,6 @@ Author:
 --*/
 
 #include "math/polysat/univariate/univariate_solver.h"
-#include "math/polysat/log.h"
-#include "sat/sat_solver/inc_sat_solver.h"
 #include "solver/solver.h"
 #include "util/util.h"
 #include "ast/ast.h"
@@ -55,9 +53,7 @@ namespace polysat {
         ~univariate_bitblast_solver() override = default;
 
         void push() override {
-            // LOG("univariate push...");
             s->push();
-            // LOG("univariate push done");
         }
 
         void pop(unsigned n) override {