Skip to content
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

compiles on noetic #18

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

compiles on noetic #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 5 additions & 11 deletions factor_handlers/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ project(factor_handlers)

SET(CMAKE_BUILD_TYPE Release)

add_compile_options(-Wall -Wextra)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

find_package(GTSAM REQUIRED)
if (NOT GTSAM_FOUND)
message(FATAL_ERROR "This program requires the GTSAM library.")
Expand Down Expand Up @@ -59,17 +64,6 @@ catkin_package(
Boost
)

include(CheckCXXCompilerFlag)
check_cxx_compiler_flag("-std=c++11" COMPILER_SUPPORTS_CXX11)
check_cxx_compiler_flag("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
if (COMPILER_SUPPORTS_CXX11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
elseif(COMPILER_SUPPORTS_CXX0X)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
else()
message(FATAL_ERROR "${CMAKE_CXX_COMPILER} doesn't provide c++11 support.")
endif()

include_directories(include ${catkin_INCLUDE_DIRS} ${GTSAM_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
link_directories(${catkin_LIBRARY_DIRS} ${GTSAM_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
add_library(${PROJECT_NAME}
Expand Down
2 changes: 1 addition & 1 deletion install/lamp_http.rosinstall
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- git:
local-name: gtsam
uri: https://github.com/borglab/gtsam.git
version: develop
version: 4.2a9
- git:
local-name: kimera_rpgo
uri: https://github.com/MIT-SPARK/Kimera-RPGO.git
Expand Down
2 changes: 1 addition & 1 deletion install/lamp_ssh.rosinstall
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- git:
local-name: gtsam
uri: [email protected]:borglab/gtsam.git
version: develop
version: 4.2a9
- git:
local-name: kimera_rpgo
uri: [email protected]:MIT-SPARK/Kimera-RPGO.git
Expand Down
16 changes: 5 additions & 11 deletions lamp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ project(lamp)

SET(CMAKE_BUILD_TYPE Release)

add_compile_options(-Wall -Wextra)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

find_package(GTSAM REQUIRED)
if (NOT GTSAM_FOUND)
message(FATAL_ERROR "This program requires the GTSAM library.")
Expand Down Expand Up @@ -65,17 +70,6 @@ catkin_package(
Boost
)

include(CheckCXXCompilerFlag)
check_cxx_compiler_flag("-std=c++11" COMPILER_SUPPORTS_CXX11)
check_cxx_compiler_flag("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
if (COMPILER_SUPPORTS_CXX11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
elseif(COMPILER_SUPPORTS_CXX0X)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
else()
message(FATAL_ERROR "${CMAKE_CXX_COMPILER} doesn't provide c++11 support.")
endif()

include_directories(include ${catkin_INCLUDE_DIRS} ${GTSAM_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
link_directories(${catkin_LIBRARY_DIRS} ${GTSAM_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
add_library(${PROJECT_NAME} src/LampRobot.cc src/LampBase.cc src/LampBaseStation.cc)
Expand Down
8 changes: 4 additions & 4 deletions lamp_utils/include/lamp_utils/gicp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,10 @@ class MultithreadedGeneralizedIterativeClosestPoint
/** \brief Provide a pointer to the input dataset
* \param cloud the const boost shared pointer to a PointCloud message
*/
PCL_DEPRECATED(
"[pcl::registration::MultithreadedGeneralizedIterativeClosestPoint::"
"setInputCloud] setInputCloud is deprecated. Please use setInputSource "
"instead.")
// PCL_DEPRECATED(
// "[pcl::registration::MultithreadedGeneralizedIterativeClosestPoint::"
// "setInputCloud] setInputCloud is deprecated. Please use setInputSource "
// "instead.")
void setInputCloud(const PointCloudSourceConstPtr& cloud);

/** \brief Provide a pointer to the input dataset
Expand Down
16 changes: 5 additions & 11 deletions pose_graph_visualizer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ IF(NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE Release)
ENDIF()

add_compile_options(-Wall -Wextra)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

find_package(PCL 1.7 REQUIRED COMPONENTS common)
if(NOT PCL_FOUND)
message(FATAL_ERROR "This program requires the PCL library.")
Expand Down Expand Up @@ -46,17 +51,6 @@ endif(NOT GTSAM_FOUND)

find_package(Boost 1.58 COMPONENTS filesystem program_options timer REQUIRED)

include(CheckCXXCompilerFlag)
check_cxx_compiler_flag("-std=c++11" COMPILER_SUPPORTS_CXX11)
check_cxx_compiler_flag("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
if (COMPILER_SUPPORTS_CXX11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
elseif(COMPILER_SUPPORTS_CXX0X)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
else()
message(FATAL_ERROR "${CMAKE_CXX_COMPILER} doesn't provide c++11 support.")
endif()

include_directories(
include
${catkin_INCLUDE_DIRS}
Expand Down