use cmake glob to find source files, delete obsolete files (3821c684) · Commits · github_fork / Clip

CMakeLists.txt

+4 −51

Original line number	Diff line number	Diff line
		@@ -29,57 +29,10 @@ include_directories(${CAIRO_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} ${HARFBUZZ_IN

		# Build: PlotFX Library
		# -----------------------------------------------------------------------------
		add_library(plotfx STATIC
		source/plotfx.cc
		source/plotfx_sdl.cc # TODO: only if SDL enabled
		source/elements/axis.cc
		source/elements/points.cc
		source/legend.cc
		source/config_helpers.cc
		source/data_model.cc
		source/dimension.cc
		source/domain.cc
		source/document.cc
		source/format.cc
		source/plist/plist.cc
		source/plist/plist_parser.cc
		source/graphics/path.cc
		source/graphics/brush.cc
		source/graphics/color.cc
		source/graphics/geometry.cc
		source/graphics/image.cc
		source/graphics/layer.cc
		source/graphics/layer_pixmap.cc
		source/graphics/layer_svg.cc
		source/graphics/layout.cc
		source/graphics/measure.cc
		source/graphics/text.cc
		source/graphics/text_layout.cc
		source/graphics/text_shaper.cc
		source/graphics/rasterize.cc
		source/graphics/png.cc
		source/graphics/font_lookup.cc
		source/element_factory.cc
		source/utils/random.cc
		source/utils/csv.cc
		source/utils/bufferutil.cc
		source/utils/exception.cc
		source/utils/UnixTime.cc
		source/utils/inspect.cc
		source/utils/stringutil.cc
		source/utils/duration.cc
		source/utils/CivilTime.cc
		source/utils/buffer.cc
		source/utils/fileutil.cc
		source/utils/file.cc
		source/utils/flagparser.cc
		source/utils/ISO8601.cc
		source/utils/UTF8.cc
		source/utils/wallclock.cc)

		set_target_properties(plotfx PROPERTIES
		PUBLIC_HEADER "source/plotfx.h;source/plotfx_sdl.h")

		file(GLOB source_files "source/*/.cc" "source/*.cc")
		list(REMOVE_ITEM source_files "source/plotfx_cli.cc")
		add_library(plotfx STATIC ${source_files})
		set_target_properties(plotfx PROPERTIES PUBLIC_HEADER "source/plotfx.h;source/plotfx_sdl.h")
		set(PLOTFX_LDFLAGS plotfx ${CAIRO_LIBRARIES} ${FREETYPE_LIBRARIES} ${HARFBUZZ_LIBRARIES} ${HARFBUZZ_ICU_LIBRARIES} ${PNG_LIBRARIES} ${FONTCONFIG_LIBRARIES})

source/plot.cc

+0 −98

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@
		#include "plot_bars.h"
		#include "plot_labels.h"
		#include "plot_lines.h"
		#include "plot_points.h"
		#include "legend.h"

		using namespace std::placeholders;
		@@ -62,29 +61,6 @@ ReturnCode draw(
		config.margins[2],
		config.margins[3]);

		if (auto rc = axis_layout(
		bbox,
		config.axis_top,
		config.axis_right,
		config.axis_bottom,
		config.axis_left,
		*layer,
		&bbox); !rc) {
		return rc;
		}

		// render axes
		if (auto rc = axis_draw_all(
		bbox,
		config.axis_top,
		config.axis_right,
		config.axis_bottom,
		config.axis_left,
		layer);
		!rc) {
		return rc;
		}

		// render grid
		if (auto rc = grid_draw(config.grid, bbox, layer); !rc) {
		return rc;
		@@ -343,74 +319,6 @@ ReturnCode configure_style(
		auto domain_y = find_ptr(scales, SCALE_DEFAULT_Y);

		static const ParserDefinitions pdefs = {
		{"axis-top", bind(&parseAxisModeProp, _1, &config->axis_top.mode)},
		{"axis-top-scale", bind(&configure_string, _1, &config->axis_top.scale)},
		{"axis-top-format", bind(&confgure_format, _1, &config->axis_top.label_formatter)},
		{
		"axis-top-layout",
		bind(
		&axis_configure_label_placement,
		_1,
		&config->axis_top.label_placement),
		},
		{"axis-right", bind(&parseAxisModeProp, _1, &config->axis_right.mode)},
		{"axis-right-scale", bind(&configure_string, _1, &config->axis_right.scale)},
		{"axis-right-format", bind(&confgure_format, _1, &config->axis_right.label_formatter)},
		{
		"axis-right-layout",
		bind(
		&axis_configure_label_placement,
		_1,
		&config->axis_right.label_placement),
		},
		{"axis-bottom", bind(&parseAxisModeProp, _1, &config->axis_bottom.mode)},
		{"axis-bottom-scale", bind(&configure_string, _1, &config->axis_bottom.scale)},
		{"axis-bottom-format", bind(&confgure_format, _1, &config->axis_bottom.label_formatter)},
		{
		"axis-bottom-layout",
		bind(
		&axis_configure_label_placement,
		_1,
		&config->axis_bottom.label_placement),
		},
		{"axis-left", bind(&parseAxisModeProp, _1, &config->axis_left.mode)},
		{"axis-left-scale", bind(&configure_string, _1, &config->axis_left.scale)},
		{"axis-left-format", bind(&confgure_format, _1, &config->axis_left.label_formatter)},
		{
		"axis-left-layout",
		bind(
		&axis_configure_label_placement,
		_1,
		&config->axis_left.label_placement),
		},
		{
		"axis-x-format",
		configure_multiprop({
		bind(&confgure_format, _1, &config->axis_top.label_formatter),
		bind(&confgure_format, _1, &config->axis_bottom.label_formatter),
		})
		},
		{
		"axis-x-layout",
		configure_multiprop({
		bind(&axis_configure_label_placement, _1, &config->axis_top.label_placement),
		bind(&axis_configure_label_placement, _1, &config->axis_bottom.label_placement),
		})
		},
		{
		"axis-y-format",
		configure_multiprop({
		bind(&confgure_format, _1, &config->axis_left.label_formatter),
		bind(&confgure_format, _1, &config->axis_right.label_formatter),
		})
		},
		{
		"axis-y-layout",
		configure_multiprop({
		bind(&axis_configure_label_placement, _1, &config->axis_left.label_placement),
		bind(&axis_configure_label_placement, _1, &config->axis_right.label_placement),
		})
		},
		{
		"margin",
		configure_multiprop({
		@@ -464,12 +372,6 @@ ReturnCode configure(
		ref(plist),
		ref(legend_items),
		&config->legends),
		bind(&axis_resolve,
		ref(scales),
		&config->axis_top,
		&config->axis_right,
		&config->axis_bottom,
		&config->axis_left),
		});
		}

source/plot.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@
		#include <source/element.h>
		#include <source/document.h>
		#include <source/data_model.h>
		#include "plot_axis.h"
		#include "elements/axis.h"
		#include "plot_gridlines.h"
		#include "legend.h"
		#include "dimension.h"

source/plot_area.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@
		#include <source/element.h>
		#include <source/config_helpers.h>
		#include <source/utils/algo.h>
		#include "plot_axis.h"
		#include "elements/axis.h"
		#include "plot.h"
		#include "legend.h"

source/plot_bars.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@
		#include <source/domain.h>
		#include <source/element.h>
		#include <source/config_helpers.h>
		#include "plot_axis.h"
		#include "elements/axis.h"
		#include "plot.h"

		namespace plotfx {

Admin message