Commit 110410c2 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

move to core/plot

rename 'fnordmetric' to 'signaltk', merge 2015/16 changes to libcplot
parent 22dbafdc
Loading
Loading
Loading
Loading
+6 −9
Original line number Diff line number Diff line
cmake_minimum_required(VERSION 2.8.8)
project(libcplot)
project(signaltk)

# INCLUDES
set(MODULE_INCLUDE
    ${PROJECT_BINARY_DIR}
    ${CMAKE_CURRENT_BINARY_DIR}/src
    ${CMAKE_CURRENT_SOURCE_DIR}/src)

include_directories(${MODULE_INCLUDE})
set(CPLOT_INCLUDE ${MODULE_INCLUDE} PARENT_SCOPE)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})

# DEPENDENCIES
find_package(Threads)

add_subdirectory(src/cplot)
add_subdirectory(core/plot)
add_subdirectory(core/util)

add_subdirectory(test/plot)

Makefile

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line
all: build

build:
	mkdir -p build
	(cd build && cmake -DCMAKE_BUILD_TYPE=Release ../cmake && make)

build-dbg:
	mkdir -p build-dbg
	(cd build-dbg && cmake -GNinja -DCMAKE_BUILD_TYPE=Debug ../cmake && ninja)

test: build
	@find build/tests -name "test-*" -exec ./{} \;

test-dbg: build-dbg
	@find build-dbg/tests -name "test-*" -exec ./{} \;

clean:
	rm -rf build build-dbg .dev_assets

install:
	(cd build && make install)

devserver: build-dbg
	mkdir -p /tmp/fnordmetric-data
	rm -rf .dev_assets
	mkdir -p .dev_assets/fnord
	ln -s ../../src/libfnord/fnord-webcomponents/components .dev_assets/fnord/components
	ln -s ../src/libfnord/fnord-metricdb/metric-explorer .dev_assets/fnord-metricdb
	ln -s ../../src/libfnord/fnord-webcomponents/3rdparty .dev_assets/fnord/3rdparty
	ln -s ../../src/libfnord/fnord-webcomponents/themes .dev_assets/fnord/themes
	ln -s ../../src/libfnord/fnord-webcomponents/fnord.js .dev_assets/fnord/fnord.js
	ln -s ../src/fnordmetric/webui .dev_assets/fnordmetric
	DEV_ASSET_PATH=./.dev_assets ./build-dbg/fnordmetric-server --datadir /tmp/fnordmetric-data --verbose

.PHONY: clean build build-dbg test test-dbg clean install devserver

autogen.sh

deleted100755 → 0
+0 −7
Original line number Diff line number Diff line
#!/bin/bash
if [[ "$1" == "clean" ]]; then
  make clean
  exit 0
fi

make build
+14 −0
Original line number Diff line number Diff line
# This file is part of the "libstx" project
#   Copyright (c) 2014 Paul Asmuth, Google Inc.
#
# libstx is free software: you can redistribute it and/or modify it under
# the terms of the GNU General Public License v3.0. You should have received a
# copy of the GNU General Public License along with this program. If not, see
# <http://www.gnu.org/licenses/>.

# chart
add_library(signaltk-graphics STATIC
    canvas.cc)

#add_executable(test-cplot chart_test.cc)
#target_link_libraries(test-cplot cplot stx-base)
+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@
#include "cplot/drawable.h"
#include "cplot/legenddefinition.h"

namespace stx {
namespace signaltk {
namespace chart {
class RenderTarget;

Loading