Skip to content

Commit

Permalink
Refactor implementations into library (#16)
Browse files Browse the repository at this point in the history
* Move yaml parser implementations into library

* Move eigen conversion implementation into lib

* Move attributes util implementation into lib

* Move datetime util implementation into lib

* Move identifier util implementation into lib

* Move info file loader util implementation into lib

* Fix clang-tidy and linker errors
  • Loading branch information
johnwason committed Mar 17, 2024
1 parent 3ef5405 commit c15695c
Show file tree
Hide file tree
Showing 54 changed files with 4,728 additions and 4,495 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
run: >
cmake -G Ninja -S src -B build
${{ steps.vcpkg.outputs.vcpkg-cmake-config }}
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON
-DBULID_TESTING=ON
- name: cmake build
run: cmake --build build --config Release
Expand Down
7 changes: 5 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ set (CMAKE_CXX_STANDARD 11)

find_package(RobotRaconteur 0.17.0 REQUIRED)
find_package(yaml-cpp REQUIRED)
find_package (Eigen3 3.3 REQUIRED NO_MODULE)

if(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/robdef/group1")
message(FATAL_ERROR "RobotRaconteurCompanion must use git clone --recursive, currently missing robdef files")
Expand Down Expand Up @@ -73,10 +74,12 @@ ROBOTRACONTEUR_GENERATE_THUNK(RR_THUNK_SRCS RR_THUNK_HDRS
CPP_EXTRA_INCLUDE "RobotRaconteurCompanion/StdRobDef/StdRobDef_Macros.h"
)

add_library(RobotRaconteurCompanion ${RR_THUNK_SRCS} ${RR_THUNK_HDRS} src/StdRobDefAll.cpp src/yaml_loader_enums.cpp src/LocalIdentifiersManager.cpp src/UuidUtil.cpp)
add_library(RobotRaconteurCompanion ${RR_THUNK_SRCS} ${RR_THUNK_HDRS} src/StdRobDefAll.cpp src/yaml_loader_enums.cpp
src/LocalIdentifiersManager.cpp src/UuidUtil.cpp src/yaml_loader_impl.cpp src/EigenConverters.cpp
src/AttributesUtil.cpp src/DateTimeUtil.cpp src/IdentifierUtil.cpp src/InfoFileLoader.cpp)
SET_TARGET_PROPERTIES(RobotRaconteurCompanion PROPERTIES PREFIX lib)

target_link_libraries(RobotRaconteurCompanion PUBLIC RobotRaconteurCore)
target_link_libraries(RobotRaconteurCompanion PUBLIC RobotRaconteurCore Eigen3::Eigen yaml-cpp)
target_include_directories(RobotRaconteurCompanion PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/robdef_gen/>
Expand Down
Loading

0 comments on commit c15695c

Please sign in to comment.