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

Jump to bottom

Fix gtest and add C++14 option #95

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix gtest and add C++14 option #95

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
8199db0
Fix gtest
gachiemchiep Mar 29, 2021
cbedb8c
Add c++14 so it can be compiled with ceres 2.0
gachiemchiep Mar 29, 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
3 changes: 2 additions & 1 deletion rct_examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
cmake_minimum_required(VERSION 3.5.0)
project(rct_examples)
set (CMAKE_CXX_STANDARD 14)

add_compile_options(-std=c++11 -Wall -Wextra)
add_compile_options(-Wall -Wextra)

find_package(rct_optimizations REQUIRED)
find_package(rct_image_tools REQUIRED)
Expand Down
1 change: 1 addition & 0 deletions rct_optimizations/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
cmake_minimum_required(VERSION 3.5.0)
project(rct_optimizations VERSION 0.1.0 LANGUAGES CXX)
set (CMAKE_CXX_STANDARD 14)

find_package(rct_common REQUIRED)
find_package(Boost REQUIRED)
Expand Down
5 changes: 1 addition & 4 deletions rct_ros_tools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,9 @@ target_link_libraries(${PROJECT_NAME}_cmd

if(CATKIN_ENABLE_TESTING)
find_package(rostest REQUIRED)
find_package(GTest REQUIRED)
add_rostest_gtest(${PROJECT_NAME}_target_loader_utest test/target_loader.test test/target_loader_utest.cpp)
catkin_add_gtest(${PROJECT_NAME}_target_loader_utest test/target_loader.test test/target_loader_utest.cpp)
target_link_libraries(${PROJECT_NAME}_target_loader_utest
${PROJECT_NAME}_data_loader
GTest::GTest
GTest::Main
${catkin_LIBRARIES}
)
endif()
Expand Down
2 changes: 2 additions & 0 deletions rct_ros_tools/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,7 @@
<depend>std_srvs</depend>
<depend>tf2_ros</depend>
<depend>yaml-cpp</depend>
<test_depend>rosunit</test_depend>


</package>