Merge branch 'master' of https://github.com/z3prover/z3 into opt

contrib/cmake/src/interp/CMakeLists.txt

@@ -2,7 +2,6 @@ z3_add_component(interp
   SOURCES
     iz3base.cpp
     iz3checker.cpp
-    iz3foci.cpp
     iz3interp.cpp
     iz3mgr.cpp
     iz3pp.cpp

contrib/cmake/src/test/CMakeLists.txt

@@ -132,13 +132,5 @@ target_include_directories(test-z3 PRIVATE ${Z3_COMPONENT_EXTRA_INCLUDE_DIRS})
 z3_append_linker_flag_list_to_target(test-z3 ${Z3_DEPENDENT_EXTRA_CXX_LINK_FLAGS})
 z3_add_component_dependencies_to_target(test-z3 ${z3_test_expanded_deps})
 
-add_executable(lp_tst lp_main.cpp lp.cpp $<TARGET_OBJECTS:util>   $<TARGET_OBJECTS:lp>)
-target_compile_definitions(lp_tst PRIVATE ${Z3_COMPONENT_CXX_DEFINES})
-target_compile_options(lp_tst PRIVATE ${Z3_COMPONENT_CXX_FLAGS})
-target_include_directories(lp_tst PRIVATE ${Z3_COMPONENT_EXTRA_INCLUDE_DIRS})
-target_link_libraries(lp_tst PRIVATE ${Z3_DEPENDENT_LIBS})
-z3_append_linker_flag_list_to_target(lp_tst ${Z3_DEPENDENT_EXTRA_CXX_LINK_FLAGS})
-
-
 
 

contrib/cmake/src/util/lp/CMakeLists.txt

@@ -0,0 +1,35 @@
+z3_add_component(lp
+  SOURCES
+    lp_utils.cpp
+    binary_heap_priority_queue_instances.cpp
+    binary_heap_upair_queue_instances.cpp
+    bound_propagator.cpp
+    core_solver_pretty_printer_instances.cpp
+    dense_matrix_instances.cpp
+    eta_matrix_instances.cpp
+    indexed_vector_instances.cpp
+    lar_core_solver_instances.cpp
+    lp_core_solver_base_instances.cpp
+    lp_dual_core_solver_instances.cpp
+    lp_dual_simplex_instances.cpp
+    lp_primal_core_solver_instances.cpp
+    lp_primal_simplex_instances.cpp
+    lp_settings_instances.cpp
+    lp_solver_instances.cpp
+    lu_instances.cpp
+    matrix_instances.cpp
+    permutation_matrix_instances.cpp
+	quick_xplain.cpp
+    row_eta_matrix_instances.cpp
+    scaler_instances.cpp
+    sparse_matrix_instances.cpp
+    square_dense_submatrix_instances.cpp
+    static_matrix_instances.cpp
+    random_updater_instances.cpp      
+  COMPONENT_DEPENDENCIES
+    util
+  PYG_FILES
+    lp_params.pyg
+)
+
+include_directories(${src_SOURCE_DIR})