aboutsummaryrefslogtreecommitdiff
path: root/ink_stroke_modeler
diff options
context:
space:
mode:
authorSamuel Freilich <sfreilich@google.com>2022-03-07 12:50:49 -0800
committerCopybara-Service <copybara-worker@google.com>2022-03-07 12:51:17 -0800
commit0b0d57895bbe4afaf1d77d0a22a599bb8012444b (patch)
tree2d8b68a37f7c0cfb2727937b943771daa1df6a0b /ink_stroke_modeler
parentbf6f33f34f7063ae8ccc1e1f798d3ecf14286f0a (diff)
downloadink-stroke-modeler-0b0d57895bbe4afaf1d77d0a22a599bb8012444b.tar.gz
Fix CMake build structure and add usage docs
Focus on consumers using submodules + add_subdirectory, pruning logic related to local installation for now. Targets are now namespaced properly in `InkStrokeModeler::`. Adds usage documentation for consuming the library from Bazel and CMake projects. PiperOrigin-RevId: 433015667
Diffstat (limited to 'ink_stroke_modeler')
-rw-r--r--ink_stroke_modeler/CMakeLists.txt34
-rw-r--r--ink_stroke_modeler/internal/CMakeLists.txt60
-rw-r--r--ink_stroke_modeler/internal/prediction/CMakeLists.txt46
-rw-r--r--ink_stroke_modeler/internal/prediction/kalman_filter/CMakeLists.txt6
4 files changed, 72 insertions, 74 deletions
diff --git a/ink_stroke_modeler/CMakeLists.txt b/ink_stroke_modeler/CMakeLists.txt
index c204cac..b31e9c7 100644
--- a/ink_stroke_modeler/CMakeLists.txt
+++ b/ink_stroke_modeler/CMakeLists.txt
@@ -22,11 +22,10 @@ ink_cc_library(
HDRS
params.h
DEPS
- types
+ InkStrokeModeler::types
absl::status
absl::strings
absl::variant
- PUBLIC
)
ink_cc_test(
@@ -35,7 +34,7 @@ ink_cc_test(
SRCS
params_test.cc
DEPS
- params
+ InkStrokeModeler::params
absl::status
GTest::gmock_main
)
@@ -45,7 +44,6 @@ ink_cc_library(
types
HDRS
types.h
- PUBLIC
)
ink_cc_test(
@@ -54,8 +52,8 @@ ink_cc_test(
SRCS
types_test.cc
DEPS
- types
- type_matchers
+ InkStrokeModeler::types
+ InkStrokeModeler::type_matchers
GTest::gmock_main
)
@@ -67,15 +65,15 @@ ink_cc_library(
HDRS
stroke_modeler.h
DEPS
- params
- types
- internal_types
- position_modeler
- stylus_state_modeler
- wobble_smoother
- input_predictor
- kalman_predictor
- stroke_end_predictor
+ InkStrokeModeler::params
+ InkStrokeModeler::types
+ InkStrokeModeler::internal_types
+ InkStrokeModeler::position_modeler
+ InkStrokeModeler::stylus_state_modeler
+ InkStrokeModeler::wobble_smoother
+ InkStrokeModeler::input_predictor
+ InkStrokeModeler::kalman_predictor
+ InkStrokeModeler::stroke_end_predictor
absl::core_headers
absl::memory
absl::status
@@ -90,9 +88,9 @@ ink_cc_test(
SRCS
stroke_modeler_test.cc
DEPS
- params
- stroke_modeler
- type_matchers
+ InkStrokeModeler::params
+ InkStrokeModeler::stroke_modeler
+ InkStrokeModeler::type_matchers
absl::status
GTest::gmock_main
)
diff --git a/ink_stroke_modeler/internal/CMakeLists.txt b/ink_stroke_modeler/internal/CMakeLists.txt
index 9d78957..b2f04c1 100644
--- a/ink_stroke_modeler/internal/CMakeLists.txt
+++ b/ink_stroke_modeler/internal/CMakeLists.txt
@@ -20,7 +20,7 @@ ink_cc_library(
HDRS
internal_types.h
DEPS
- types
+ InkStrokeModeler::types
)
ink_cc_library(
@@ -31,8 +31,8 @@ ink_cc_library(
HDRS
type_matchers.h
DEPS
- internal_types
- types
+ InkStrokeModeler::internal_types
+ InkStrokeModeler::types
GTest::gmock_main
)
@@ -42,7 +42,7 @@ ink_cc_library(
HDRS
utils.h
DEPS
- types
+ InkStrokeModeler::types
)
ink_cc_test(
@@ -51,8 +51,8 @@ ink_cc_test(
SRCS
utils_test.cc
DEPS
- type_matchers
- utils
+ InkStrokeModeler::type_matchers
+ InkStrokeModeler::utils
GTest::gmock_main
)
@@ -64,9 +64,9 @@ ink_cc_library(
HDRS
wobble_smoother.h
DEPS
- utils
- params
- types
+ InkStrokeModeler::utils
+ InkStrokeModeler::params
+ InkStrokeModeler::types
)
ink_cc_test(
@@ -75,10 +75,10 @@ ink_cc_test(
SRCS
wobble_smoother_test.cc
DEPS
- type_matchers
- wobble_smoother
- params
- types
+ InkStrokeModeler::type_matchers
+ InkStrokeModeler::wobble_smoother
+ InkStrokeModeler::params
+ InkStrokeModeler::types
GTest::gmock_main
)
@@ -88,10 +88,10 @@ ink_cc_library(
HDRS
position_modeler.h
DEPS
- internal_types
- utils
- params
- types
+ InkStrokeModeler::internal_types
+ InkStrokeModeler::utils
+ InkStrokeModeler::params
+ InkStrokeModeler::types
)
ink_cc_test(
@@ -100,11 +100,11 @@ ink_cc_test(
SRCS
position_modeler_test.cc
DEPS
- internal_types
- position_modeler
- type_matchers
- params
- types
+ InkStrokeModeler::internal_types
+ InkStrokeModeler::position_modeler
+ InkStrokeModeler::type_matchers
+ InkStrokeModeler::params
+ InkStrokeModeler::types
GTest::gmock_main
)
@@ -116,9 +116,9 @@ ink_cc_library(
HDRS
stylus_state_modeler.h
DEPS
- internal_types
- utils
- params
+ InkStrokeModeler::internal_types
+ InkStrokeModeler::utils
+ InkStrokeModeler::params
)
ink_cc_test(
@@ -127,10 +127,10 @@ ink_cc_test(
SRCS
stylus_state_modeler_test.cc
DEPS
- internal_types
- stylus_state_modeler
- type_matchers
- params
- types
+ InkStrokeModeler::internal_types
+ InkStrokeModeler::stylus_state_modeler
+ InkStrokeModeler::type_matchers
+ InkStrokeModeler::params
+ InkStrokeModeler::types
GTest::gmock_main
)
diff --git a/ink_stroke_modeler/internal/prediction/CMakeLists.txt b/ink_stroke_modeler/internal/prediction/CMakeLists.txt
index d3fcd76..e54dbbe 100644
--- a/ink_stroke_modeler/internal/prediction/CMakeLists.txt
+++ b/ink_stroke_modeler/internal/prediction/CMakeLists.txt
@@ -20,9 +20,9 @@ ink_cc_library(
HDRS
input_predictor.h
DEPS
- params
- types
- internal_types
+ InkStrokeModeler::params
+ InkStrokeModeler::types
+ InkStrokeModeler::internal_types
)
ink_cc_library(
@@ -33,12 +33,12 @@ ink_cc_library(
HDRS
kalman_predictor.h
DEPS
- input_predictor
- params
- types
- internal_types
- utils
- kalman_filter
+ InkStrokeModeler::input_predictor
+ InkStrokeModeler::params
+ InkStrokeModeler::types
+ InkStrokeModeler::internal_types
+ InkStrokeModeler::utils
+ InkStrokeModeler::kalman_filter
)
ink_cc_test(
@@ -47,11 +47,11 @@ ink_cc_test(
SRCS
kalman_predictor_test.cc
DEPS
- input_predictor
- kalman_predictor
- params
- types
- type_matchers
+ InkStrokeModeler::input_predictor
+ InkStrokeModeler::kalman_predictor
+ InkStrokeModeler::params
+ InkStrokeModeler::types
+ InkStrokeModeler::type_matchers
absl::optional
GTest::gmock_main
)
@@ -64,11 +64,11 @@ ink_cc_library(
HDRS
stroke_end_predictor.h
DEPS
- input_predictor
- params
- types
- internal_types
- position_modeler
+ InkStrokeModeler::input_predictor
+ InkStrokeModeler::params
+ InkStrokeModeler::types
+ InkStrokeModeler::internal_types
+ InkStrokeModeler::position_modeler
absl::optional
)
@@ -78,9 +78,9 @@ ink_cc_test(
SRCS
stroke_end_predictor_test.cc
DEPS
- input_predictor
- stroke_end_predictor
- params
- type_matchers
+ InkStrokeModeler::input_predictor
+ InkStrokeModeler::stroke_end_predictor
+ InkStrokeModeler::params
+ InkStrokeModeler::type_matchers
GTest::gmock_main
)
diff --git a/ink_stroke_modeler/internal/prediction/kalman_filter/CMakeLists.txt b/ink_stroke_modeler/internal/prediction/kalman_filter/CMakeLists.txt
index 2661a10..03bbb47 100644
--- a/ink_stroke_modeler/internal/prediction/kalman_filter/CMakeLists.txt
+++ b/ink_stroke_modeler/internal/prediction/kalman_filter/CMakeLists.txt
@@ -25,7 +25,7 @@ ink_cc_test(
SRCS
matrix_test.cc
DEPS
- matrix
+ InkStrokeModeler::matrix
GTest::gmock_main
)
@@ -39,7 +39,7 @@ ink_cc_library(
axis_predictor.h
kalman_filter.h
DEPS
- matrix
+ InkStrokeModeler::matrix
absl::memory
)
@@ -49,6 +49,6 @@ ink_cc_test(
SRCS
axis_predictor_test.cc
DEPS
- kalman_filter
+ InkStrokeModeler::kalman_filter
GTest::gmock_main
)