better build process/include paths WIP (7daab403) · Commits · github_fork / Clip

.gitignore

+0 −1

Original line number	Diff line number	Diff line
		.DS_Store
		build

Makefile

+4 −16

Original line number	Diff line number	Diff line
		@@ -4,24 +4,12 @@
		# Licensed under the MIT license (see LICENSE).

		all:
		mkdir -p build/tests
		(cd build && cmake .. && make)
		(cd build/cmake && make)

		test: all
		@find build/tests -iname "test-*" \| while read t; do $$t \|\| exit 1; done
		test:
		(cd build/cmake && make test)

		clean:
		rm -rf build/*

		find . \
		-name 'CMakeCache.txt' -o \
		-name 'CMakeFiles' -o \
		-name cmake_install.cmake -o \
		-name '*.so' -o \
		-name '*.dylib' -o \
		-name '*.bundle' -o \
		-name '*.dll' -o \
		-name '*.a' \| \
		xargs rm -rf
		(cd build/cmake && make clean)

		.PHONY: all test clean

build/.gitkeep

deleted100644 → 0

+0 −0

Empty file deleted.

build/cmake/.gitignore

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		stage
		target

CMakeLists.txt→build/cmake/CMakeLists.txt

+66 −0

Original line number	Diff line number	Diff line
		@@ -6,42 +6,42 @@ cmake_minimum_required(VERSION 2.6)
		project(fnordmetric)

		set(FNORDMETRIC_SOURCES
		src/util/format.cc
		src/util/inputstream.cc
		src/util/runtimeexception.cc)
		stage/src/fnordmetric/util/format.cc
		stage/src/fnordmetric/util/inputstream.cc
		stage/src/fnordmetric/util/runtimeexception.cc)

		set(FNORDMETRIC_UI_SOURCES
		${FNORDMETRIC_SOURCES}
		src/ui/areachart.cc
		src/ui/axisdefinition.cc
		src/ui/barchart.cc
		src/ui/canvas.cc
		src/ui/linechart.cc
		src/ui/pointchart.cc)
		stage/src/fnordmetric/ui/areachart.cc
		stage/src/fnordmetric/ui/axisdefinition.cc
		stage/src/fnordmetric/ui/barchart.cc
		stage/src/fnordmetric/ui/canvas.cc
		stage/src/fnordmetric/ui/linechart.cc
		stage/src/fnordmetric/ui/pointchart.cc)

		set(FNORDMETRIC_QUERY_SOURCES
		${FNORDMETRIC_UI_SOURCES}
		src/query/query.cc
		src/query/astnode.cc
		src/query/compile.cc
		src/query/drawstatement.cc
		src/query/executable.cc
		src/query/execute.cc
		src/query/expressions/aggregate.cc
		src/query/expressions/boolean.cc
		src/query/expressions/math.cc
		src/query/grouper.cc
		src/query/parser.cc
		src/query/queryplan.cc
		src/query/svalue.cc
		src/query/symboltable.cc
		src/query/token.cc
		src/query/tokenize.cc)
		stage/src/fnordmetric/query/query.cc
		stage/src/fnordmetric/query/astnode.cc
		stage/src/fnordmetric/query/compile.cc
		stage/src/fnordmetric/query/drawstatement.cc
		stage/src/fnordmetric/query/executable.cc
		stage/src/fnordmetric/query/execute.cc
		stage/src/fnordmetric/query/expressions/aggregate.cc
		stage/src/fnordmetric/query/expressions/boolean.cc
		stage/src/fnordmetric/query/expressions/math.cc
		stage/src/fnordmetric/query/grouper.cc
		stage/src/fnordmetric/query/parser.cc
		stage/src/fnordmetric/query/queryplan.cc
		stage/src/fnordmetric/query/svalue.cc
		stage/src/fnordmetric/query/symboltable.cc
		stage/src/fnordmetric/query/token.cc
		stage/src/fnordmetric/query/tokenize.cc)

		set(FNORDMETRIC_CSV_BACKEND_SOURCES
		src/query/backends/csv/csvinputstream.cc)
		stage/src/fnordmetric/query/backends/csv/csvinputstream.cc)

		include_directories(./src)
		include_directories(stage/src)
		set(CMAKE_CXX_FLAGS "-std=c++0x -stdlib=libc++")

		add_definitions("-Wno-predefined-identifier-outside-function")
		@@ -49,7 +49,7 @@ add_definitions("-Wno-predefined-identifier-outside-function")

		add_executable(tests/test-query
		${FNORDMETRIC_QUERY_SOURCES}
		src/query/query_test.cc)
		stage/src/fnordmetric/query/query_test.cc)

		# add_executable(tests/test-ui
		# ${FNORDMETRIC_UI_SOURCES}
		@@ -58,9 +58,9 @@ add_executable(tests/test-query
		add_executable(tests/test-input-stream
		${FNORDMETRIC_SOURCES}
		${FNORDMETRIC_CSV_BACKEND_SOURCES}
		src/util/inputstream_test.cc)
		stage/src/fnordmetric/util/inputstream_test.cc)

		add_executable(tests/test-csv-backend
		${FNORDMETRIC_UI_SOURCES}
		${FNORDMETRIC_CSV_BACKEND_SOURCES}
		src/query/backends/csv/csvbackend_test.cc)
		stage/src/fnordmetric/query/backends/csv/csvbackend_test.cc)

Admin message