From 562fa62e8f5702b27cda5ce87dedfbf45f3e73ba Mon Sep 17 00:00:00 2001 From: pantor Date: Sun, 3 Sep 2023 10:34:22 +0200 Subject: [PATCH] expose internal by default --- CMakeLists.txt | 5 ----- src/ruckig/python.cpp | 4 ---- 2 files changed, 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae52b9f6..4b424012 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,6 @@ option(BUILD_CLOUD_CLIENT "Build cloud client to calculate Ruckig Pro trajectori option(BUILD_TESTS "Build tests" ON) option(BUILD_BENCHMARK "Build benchmark" OFF) option(BUILD_SHARED_LIBS "Build as shared library" ON) -option(EXPOSE_INTERNAL "Expose some internal classes and methods" OFF) if(WIN32 AND BUILD_SHARED_LIBS) option(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS "On Windows, export all symbols when building a shared library." ON) @@ -47,10 +46,6 @@ if(MSVC) target_compile_definitions(ruckig PUBLIC _USE_MATH_DEFINES) endif() -if(EXPOSE_INTERNAL) - target_compile_definitions(ruckig PUBLIC WITH_EXPOSE_INTERNAL) -endif() - if(BUILD_CLOUD_CLIENT) target_sources(ruckig PRIVATE src/ruckig/cloud_client.cpp) diff --git a/src/ruckig/python.cpp b/src/ruckig/python.cpp index 157f8dfa..7adc1109 100644 --- a/src/ruckig/python.cpp +++ b/src/ruckig/python.cpp @@ -63,9 +63,7 @@ limited by velocity, acceleration, and jerk constraints."; .def(py::init(), "dofs"_a, "max_number_of_waypoints"_a) #endif .def_readonly("degrees_of_freedom", &Trajectory::degrees_of_freedom) -#ifdef WITH_EXPOSE_INTERNAL .def_property_readonly("profiles", &Trajectory::get_profiles) -#endif .def_property_readonly("duration", &Trajectory::get_duration) .def_property_readonly("intermediate_durations", &Trajectory::get_intermediate_durations) .def_property_readonly("independent_min_durations", &Trajectory::get_independent_min_durations) @@ -165,7 +163,6 @@ limited by velocity, acceleration, and jerk constraints."; .def("calculate", static_cast::*)(const InputParameter&, Trajectory&, bool&)>(&RuckigThrow::calculate), "input"_a, "trajectory"_a, "was_interrupted"_a) .def("update", static_cast::*)(const InputParameter&, OutputParameter&)>(&RuckigThrow::update), "input"_a, "output"_a); -#ifdef WITH_EXPOSE_INTERNAL py::class_(m, "BrakeProfile") .def_readonly("duration", &BrakeProfile::duration) .def_readonly("t", &BrakeProfile::t) @@ -190,5 +187,4 @@ limited by velocity, acceleration, and jerk constraints."; .def_readonly("direction", &Profile::direction) .def_readonly("control_signs", &Profile::control_signs) .def("__repr__", &Profile::to_string); -#endif }