Commit aba8ef7 1 parent ad2a796 commit aba8ef7 Copy full SHA for aba8ef7
File tree 4 files changed +16
-11
lines changed
4 files changed +16
-11
lines changed Original file line number Diff line number Diff line change @@ -162,6 +162,7 @@ if(SYMFORCE_USE_EXTERNAL_LCM)
162
162
add_library (symforce_lcmtypes_cpp INTERFACE )
163
163
target_link_libraries (symforce_lcmtypes_cpp ${SYMFORCE_LCMTYPES_TARGET} )
164
164
else ()
165
+ add_subdirectory (third_party/skymarshal)
165
166
include (third_party/skymarshal/cmake/skymarshal.cmake)
166
167
167
168
add_skymarshal_bindings(symforce_lcmtypes
@@ -224,7 +225,7 @@ target_include_directories(
224
225
)
225
226
226
227
install (TARGETS symforce_gen DESTINATION lib)
227
- install (FILES ${SYMFORCE_GEN_HEADERS} DESTINATION include )
228
+ install (DIRECTORY gen/cpp/ DESTINATION include FILES_MATCHING PATTERN "*.h" PATTERN "*.tcc" )
228
229
229
230
if (SYMFORCE_BUILD_OPT)
230
231
add_subdirectory (symforce/opt)
Original file line number Diff line number Diff line change @@ -129,9 +129,6 @@ add_library(
129
129
target_link_libraries (symforce_cholesky metis ${SYMFORCE_EIGEN_TARGET} )
130
130
target_include_directories (symforce_cholesky PUBLIC ../..)
131
131
132
- install (TARGETS symforce_cholesky DESTINATION lib)
133
- install (FILES ${SYMFORCE_CHOLESKY_HEADERS} DESTINATION include )
134
-
135
132
# ------------------------------------------------------------------------------
136
133
# symforce_opt
137
134
@@ -152,13 +149,18 @@ target_link_libraries(symforce_opt
152
149
${SYMFORCE_EIGEN_TARGET}
153
150
)
154
151
155
- install (TARGETS symforce_opt DESTINATION lib)
156
- install (FILES ${SYMFORCE_OPT_HEADERS} DESTINATION include )
157
-
158
152
if (SYMFORCE_CUSTOM_TIC_TOCS)
159
153
target_link_libraries (symforce_opt ${SYMFORCE_TIC_TOC_TARGET} )
160
154
target_compile_definitions (symforce_opt
161
155
PUBLIC SYMFORCE_TIC_TOC_HEADER=${SYMFORCE_TIC_TOC_HEADER}
162
156
PUBLIC SYM_TIME_SCOPE=${SYMFORCE_TIC_TOC_MACRO}
163
157
)
164
158
endif (SYMFORCE_CUSTOM_TIC_TOCS)
159
+
160
+
161
+ # ------------------------------------------------------------------------------
162
+ # install
163
+
164
+ install (TARGETS symforce_cholesky DESTINATION lib)
165
+ install (TARGETS symforce_opt DESTINATION lib)
166
+ install (DIRECTORY ./ DESTINATION include /symforce/opt FILES_MATCHING PATTERN "*.h" PATTERN "*.tcc" )
Original file line number Diff line number Diff line change @@ -3,3 +3,4 @@ project(skymarshal)
3
3
4
4
add_library (skymarshal_core INTERFACE include /lcm/lcm_coretypes.h)
5
5
target_include_directories (skymarshal_core INTERFACE include )
6
+ install (DIRECTORY include / DESTINATION include )
Original file line number Diff line number Diff line change @@ -53,15 +53,16 @@ function(add_cpp_bindings
53
53
54
54
foreach (package_and_type ${types_to_generate} )
55
55
get_package_and_type(${package_and_type} package type )
56
- list (APPEND generated_files ${bindings_dir} /cpp/lcmtypes/${package} /${type} .hpp)
56
+ set (generated_file ${bindings_dir} /cpp/lcmtypes/${package} /${type} .hpp)
57
+ list (APPEND generated_files ${generated_file} )
58
+
59
+ install (FILES ${generated_file} DESTINATION include /lcmtypes/${package} )
57
60
endforeach ()
58
61
59
62
add_library (${target_name} _cpp INTERFACE ${generated_files} )
60
- target_include_directories (${target_name} _cpp INTERFACE ${bindings_dir} /cpp ${CMAKE_CURRENT_SOURCE_DIR} /third_party/lcm )
63
+ target_include_directories (${target_name} _cpp INTERFACE ${bindings_dir} /cpp)
61
64
target_link_libraries (${target_name} _cpp INTERFACE skymarshal_core)
62
65
63
- install (FILES ${generated_files} DESTINATION include )
64
-
65
66
set (${generated_files_outvar} ${generated_files} PARENT_SCOPE)
66
67
67
68
list (APPEND skymarshal_args
You can’t perform that action at this time.
0 commit comments