Merge pull request #1216 from delcypher/cmake_simpler_include_paths

Simpler include paths (fixes #534)

src/api/api_algebraic.cpp

@@ -18,7 +18,7 @@ Notes:
 
 --*/
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_ast_vector.h"
 #include "math/polynomial/algebraic_numbers.h"

src/api/api_arith.cpp

@@ -16,7 +16,7 @@ Revision History:
 
 --*/
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_util.h"
 #include "ast/arith_decl_plugin.h"

src/api/api_array.cpp

@@ -16,7 +16,7 @@ Revision History:
 
 --*/
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_util.h"
 #include "ast/array_decl_plugin.h"

src/api/api_ast.cpp

@@ -16,7 +16,7 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_util.h"
 #include "ast/well_sorted.h"

src/api/api_ast_map.cpp

@@ -17,7 +17,7 @@ Revision History:
 --*/
 #include<iostream>
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_ast_map.h"
 #include "api/api_ast_vector.h"

src/api/api_ast_vector.cpp

@@ -17,7 +17,7 @@ Revision History:
 --*/
 #include<iostream>
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_ast_vector.h"
 #include "ast/ast_translation.h"

src/api/api_bv.cpp

@@ -16,7 +16,7 @@ Revision History:
 
 --*/
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_util.h"
 #include "ast/bv_decl_plugin.h"

src/api/api_config_params.cpp

@@ -18,7 +18,7 @@ Revision History:
 #include "api/z3.h"
 #include "api/api_context.h"
 #include "ast/pp.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_util.h"
 #include "cmd_context/cmd_context.h"
 #include "util/symbol.h"

src/api/api_context.cpp

@@ -20,10 +20,10 @@ Revision History:
 #include<typeinfo>
 #include "api/api_context.h"
 #include "parsers/smt/smtparser.h"
-#include"version.h"
+#include "util/version.h"
 #include "ast/ast_pp.h"
 #include "ast/ast_ll_pp.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_util.h"
 #include "ast/reg_decl_plugins.h"
 #include "math/realclosure/realclosure.h"

src/api/api_datalog.cpp

@@ -20,7 +20,7 @@ Revision History:
 #include "api/api_util.h"
 #include "ast/ast_pp.h"
 #include "api/api_ast_vector.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_stats.h"
 #include "muz/fp/datalog_parser.h"
 #include "util/cancel_eh.h"

src/api/api_datatype.cpp

@@ -16,7 +16,7 @@ Revision History:
 
 --*/
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_util.h"
 #include "ast/datatype_decl_plugin.h"

src/api/api_fpa.cpp

@@ -18,7 +18,7 @@ Notes:
 --*/
 #include<iostream>
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "ast/fpa_decl_plugin.h"
 

src/api/api_goal.cpp

@@ -17,7 +17,7 @@ Revision History:
 --*/
 #include<iostream>
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_goal.h"
 #include "ast/ast_translation.h"

src/api/api_interp.cpp

@@ -18,7 +18,7 @@
 #include<sstream>
 #include<vector>
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_tactic.h"
 #include "api/api_solver.h"

src/api/api_log.cpp

@@ -17,9 +17,9 @@ Revision History:
 --*/
 #include<fstream>
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "util/util.h"
-#include"version.h"
+#include "util/version.h"
 
 std::ostream * g_z3_log = 0;
 bool g_z3_log_enabled   = false;

src/api/api_model.cpp

@@ -17,7 +17,7 @@ Revision History:
 --*/
 #include<iostream>
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_model.h"
 #include "api/api_ast_vector.h"

src/api/api_numeral.cpp

@@ -17,7 +17,7 @@ Revision History:
 --*/
 #include<iostream>
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_util.h"
 #include "ast/arith_decl_plugin.h"

src/api/api_opt.cpp

@@ -17,7 +17,7 @@ Revision History:
 --*/
 #include<iostream>
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_stats.h"
 #include "api/api_context.h"
 #include "api/api_util.h"

src/api/api_params.cpp

@@ -19,7 +19,7 @@ Revision History:
 --*/
 #include<iostream>
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_util.h"
 #include "util/params.h"

src/api/api_parsers.cpp

@@ -17,7 +17,7 @@ Revision History:
 --*/
 #include<iostream>
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_util.h"
 #include "cmd_context/cmd_context.h"

src/api/api_pb.cpp

@@ -16,7 +16,7 @@ Revision History:
 
 --*/
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_util.h"
 #include "ast/pb_decl_plugin.h"

src/api/api_polynomial.cpp

@@ -17,7 +17,7 @@ Notes:
 
 --*/
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_polynomial.h"
 #include "api/api_ast_vector.h"

src/api/api_qe.cpp

@@ -19,7 +19,7 @@ Notes:
 
 #include <iostream>
 #include "api/z3.h"
-#include "api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_util.h"
 #include "api/api_model.h"

src/api/api_quant.cpp

@@ -16,7 +16,7 @@ Revision History:
 
 --*/
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_util.h"
 #include "parsers/util/pattern_validation.h"

src/api/api_rcf.cpp

@@ -21,7 +21,7 @@ Notes:
 --*/
 #include<iostream>
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "math/realclosure/realclosure.h"
 

src/api/api_seq.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_util.h"
 #include "ast/ast_pp.h"

src/api/api_solver.cpp

@@ -18,7 +18,7 @@ Revision History:
 --*/
 #include<iostream>
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_tactic.h"
 #include "api/api_solver.h"

src/api/api_stats.cpp

@@ -17,7 +17,7 @@ Revision History:
 --*/
 #include<iostream>
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_stats.h"
 

src/api/api_tactic.cpp

@@ -17,7 +17,7 @@ Revision History:
 --*/
 #include<iostream>
 #include "api/z3.h"
-#include"api_log_macros.h"
+#include "api/api_log_macros.h"
 #include "api/api_context.h"
 #include "api/api_tactic.h"
 #include "api/api_model.h"

src/cmd_context/basic_cmds.cpp

@@ -16,7 +16,7 @@ Notes:
 
 --*/
 #include "cmd_context/cmd_context.h"
-#include"version.h"
+#include "util/version.h"
 #include "ast/ast_smt_pp.h"
 #include "ast/ast_smt2_pp.h"
 #include "ast/ast_pp.h"

src/duality/duality_wrapper.h

@@ -27,7 +27,7 @@
 #include<vector>
 #include<list>
 #include <set>
-#include"version.h"
+#include "util/version.h"
 #include<limits.h>
 
 #include "interp/iz3hash.h"

src/shell/main.cpp

@@ -26,7 +26,7 @@ Revision History:
 #include "shell/smtlib_frontend.h"
 #include "shell/z3_log_frontend.h"
 #include "util/warning.h"
-#include"version.h"
+#include "util/version.h"
 #include "shell/dimacs_frontend.h"
 #include "shell/datalog_frontend.h"
 #include "shell/opt_frontend.h"