cleaning up (b9524e8a) · Commits · github_fork / Clip

build/cmake/CMakeLists.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -42,6 +42,8 @@ set(FNORDMETRIC_CSV_BACKEND_SOURCES
		set(FNORDMETRIC_QUERY_SOURCES
		${FNORDMETRIC_UI_SOURCES}
		${FNORDMETRIC_CSV_BACKEND_SOURCES}
		stage/src/fnordmetric/query/query.cc
		stage/src/fnordmetric/query/queryservice.cc
		stage/src/fnordmetric/sql/astnode.cc
		stage/src/fnordmetric/sql/compile.cc
		stage/src/fnordmetric/sql/executable.cc
		@@ -52,12 +54,10 @@ set(FNORDMETRIC_QUERY_SOURCES
		stage/src/fnordmetric/sql/grouper.cc
		stage/src/fnordmetric/sql/parser.cc
		stage/src/fnordmetric/sql/queryplan.cc
		stage/src/fnordmetric/sql/queryservice.cc
		stage/src/fnordmetric/sql/svalue.cc
		stage/src/fnordmetric/sql/symboltable.cc
		stage/src/fnordmetric/sql/token.cc
		stage/src/fnordmetric/sql/tokenize.cc
		stage/src/fnordmetric/sql_extensions/query.cc
		stage/src/fnordmetric/sql_extensions/drawstatement.cc)

		set(FNORDMETRIC_CLI_SOURCES

+4 −4

Original line number	Diff line number	Diff line
		@@ -12,14 +12,14 @@
		#include <string>
		#include <fnordmetric/cli/cli.h>
		#include <fnordmetric/cli/flagparser.h>
		#include <fnordmetric/sql/queryservice.h>
		#include <fnordmetric/ev/eventloop.h>
		#include <fnordmetric/ev/acceptor.h>
		#include <fnordmetric/http/httpserver.h>
		#include <fnordmetric/query/queryservice.h>
		#include <fnordmetric/util/exceptionhandler.h>
		#include <fnordmetric/util/inputstream.h>
		#include <fnordmetric/util/outputstream.h>
		#include <fnordmetric/util/runtimeexception.h>
		#include <fnordmetric/ev/eventloop.h>
		#include <fnordmetric/ev/acceptor.h>
		#include <fnordmetric/http/httpserver.h>
		#include <fnordmetric/web/webinterface.h>
		#include <fnordmetric/web/queryendpoint.h>

+4 −4

Original line number	Diff line number	Diff line
		@@ -11,16 +11,16 @@
		#include <stdlib.h>
		#include <string.h>
		#include <memory>
		#include <fnordmetric/util/runtimeexception.h>
		#include <fnordmetric/sql/axisstatement.h>
		#include <fnordmetric/query/query.h>
		#include <fnordmetric/sql/backends/csv/csvbackend.h>
		#include <fnordmetric/sql/drawstatement.h>
		#include <fnordmetric/sql/executable.h>
		#include <fnordmetric/sql/parser.h>
		#include <fnordmetric/sql/query.h>
		#include <fnordmetric/sql/queryplan.h>
		#include <fnordmetric/sql/resultlist.h>
		#include <fnordmetric/sql/tablerepository.h>
		#include <fnordmetric/sql_extensions/axisstatement.h>
		#include <fnordmetric/sql_extensions/drawstatement.h>
		#include <fnordmetric/util/runtimeexception.h>

		namespace fnordmetric {
		namespace query {

+0 −0

File moved.

+3 −3

Original line number	Diff line number	Diff line
		@@ -8,14 +8,14 @@
		* <http://www.gnu.org/licenses/>.
		*/

		#include <fnordmetric/query/query.h>
		#include <fnordmetric/query/queryservice.h>
		#include <fnordmetric/sql/executable.h>
		#include <fnordmetric/sql/query.h>
		#include <fnordmetric/sql/queryservice.h>
		#include <fnordmetric/sql/resultlist.h>
		#include <fnordmetric/sql/tablerepository.h>
		#include <fnordmetric/ui/svgtarget.h>
		#include <fnordmetric/util/inputstream.h>
		#include <fnordmetric/util/jsonoutputstream.h>
		#include <fnordmetric/ui/svgtarget.h>

		namespace fnordmetric {
		namespace query {