12345qiupeng
/
cartographer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not install global_trajectory_builder.h. (#698) 

This moves the global_trajectory_builder.h header under
cartographer/internal and changes the CMakeLists.txt to
not install internal headers.

[RFC=0003](https://github.com/googlecartographer/rfcs/blob/master/text/0003-internal-headers.md)
master
Wolfgang Hess 2017-11-23 14:47:29 +01:00 committed by Wally B. Feed
parent 8f9f1cf44e
commit ec034b13bc
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -210,8 +210,12 @@ install(
)
# Install source headers.
file(GLOB_RECURSE hdrs "*.h")
foreach(HDR ${hdrs})
file(GLOB_RECURSE HDRS "*.h")
file(GLOB_RECURSE INTERNAL_HDRS "cartographer/internal/*.h")
list(REMOVE_ITEM HDRS ${INTERNAL_HDRS}) # Do not install internal headers.
file(GLOB_RECURSE INTERNAL_HDRS "cartographer_grpc/internal/*.h")
list_remove_item(HDRS INTERNAL_HDRS)
foreach(HDR ${HDRS})
file(RELATIVE_PATH REL_FIL ${PROJECT_SOURCE_DIR} ${HDR})
get_filename_component(INSTALL_DIR ${REL_FIL} DIRECTORY)
install(
@ -223,8 +227,8 @@ foreach(HDR ${hdrs})
endforeach()
# Install generated headers.
file(GLOB_RECURSE hdrs "*.h.in")
foreach(HDR ${hdrs})
file(GLOB_RECURSE HDRS "*.h.in")
foreach(HDR ${HDRS})
file(RELATIVE_PATH REL_FIL ${PROJECT_SOURCE_DIR} ${HDR})
get_filename_component(DIR ${REL_FIL} DIRECTORY)
get_filename_component(FILE_WE ${REL_FIL} NAME_WE)

6
cartographer/mapping/global_trajectory_builder.h → cartographer/internal/mapping/global_trajectory_builder.h
View File

@ -14,8 +14,8 @@
* limitations under the License.
*/
#ifndef CARTOGRAPHER_MAPPING_GLOBAL_TRAJECTORY_BUILDER_H_
#define CARTOGRAPHER_MAPPING_GLOBAL_TRAJECTORY_BUILDER_H_
#ifndef CARTOGRAPHER_INTERNAL_MAPPING_GLOBAL_TRAJECTORY_BUILDER_H_
#define CARTOGRAPHER_INTERNAL_MAPPING_GLOBAL_TRAJECTORY_BUILDER_H_
#include "cartographer/mapping/global_trajectory_builder_interface.h"
@ -94,4 +94,4 @@ class GlobalTrajectoryBuilder
} // namespace mapping
} // namespace cartographer
#endif // CARTOGRAPHER_MAPPING_GLOBAL_TRAJECTORY_BUILDER_H_
#endif // CARTOGRAPHER_INTERNAL_MAPPING_GLOBAL_TRAJECTORY_BUILDER_H_

2
cartographer/mapping/map_builder.cc
View File

@ -24,8 +24,8 @@
#include "cartographer/common/make_unique.h"
#include "cartographer/common/time.h"
#include "cartographer/internal/mapping/global_trajectory_builder.h"
#include "cartographer/mapping/collated_trajectory_builder.h"
#include "cartographer/mapping/global_trajectory_builder.h"
#include "cartographer/mapping_2d/local_trajectory_builder.h"
#include "cartographer/mapping_3d/local_trajectory_builder.h"
#include "cartographer/sensor/range_data.h"