Skip to content

Fixes a bug where includes are not visible to parent projects when rs_driver is submoduled. #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: release
Choose a base branch
from
+6 −2
Open

Fixes a bug where includes are not visible to parent projects when rs_driver is submoduled. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa6dfb2
for using this project as a submodule, needed to create an interface …
stephendb Jan 11, 2021
d7196d1
remove a space
stephendb Jan 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ if(WIN32)
cmake_policy(SET CMP0074 NEW)
endif(WIN32)
project(rs_driver VERSION 1.3.0)
add_library(rs_driver INTERFACE)

#=============================
# Compile Demos&Tools
Expand Down Expand Up @@ -83,6 +84,7 @@ endif(WIN32)

find_package(Boost COMPONENTS system date_time regex REQUIRED)
include_directories(${Boost_INCLUDE_DIRS})
target_include_directories(${PROJECT_NAME} INTERFACE ${Boost_INCLUDE_DIRS})
list(APPEND EXTERNAL_LIBS ${Boost_LIBRARIES})

#========================
Expand All @@ -92,6 +94,7 @@ if(WIN32)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
find_package(PCAP REQUIRED)
include_directories(${PCAP_INCLUDE_DIR})
target_include_directories(${PROJECT_NAME} INTERFACE ${PCAP_INCLUDE_DIR})
list(APPEND EXTERNAL_LIBS ${PCAP_LIBRARY})
else()
list(APPEND EXTERNAL_LIBS pcap)
Expand All @@ -104,6 +107,7 @@ if(${ENABLE_TRANSFORM})
add_definitions("-DENABLE_TRANSFORM")
find_package(Eigen3 REQUIRED)
include_directories(${EIGEN3_INCLUDE_DIR})
target_include_directories(${PROJECT_NAME} INTERFACE ${EIGEN3_INCLUDE_DIR})
message(=============================================================)
message("-- Enable Transform Fcuntions")
message(=============================================================)
Expand Down Expand Up @@ -165,4 +169,4 @@ if(UNIX AND ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
add_custom_target(uninstall
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
endif(NOT TARGET uninstall)
endif(UNIX AND ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
endif(UNIX AND ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
2 changes: 1 addition & 1 deletion src/rs_driver/driver/decoder/decoder_factory.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class DecoderFactory
~DecoderFactory() = default;
static std::shared_ptr<DecoderBase<T_Point>> createDecoder(const RSDriverParam& param);

private:
public:
static const LidarConstantParameter getRS16ConstantParam();
static const LidarConstantParameter getRS32ConstantParam();
static const LidarConstantParameter getRSBPConstantParam();
Expand Down