Skip to content

Commit 455486d

Browse files
authored
Use gtest installed from package managers (#139)
* Use gtest installed from package managers * Document gtest dependency * Fix gtest_main target name in CMake
1 parent fe4bbe6 commit 455486d

File tree

11 files changed

+14
-17
lines changed

11 files changed

+14
-17
lines changed

.github/workflows/apt.yml

+3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ jobs:
4141
sudo apt-get update
4242
# YARP dependencies
4343
sudo apt-get install git build-essential cmake ninja-build libace-dev libeigen3-dev libopencv-dev libtinyxml-dev
44+
# gz-sim-yarp-plugins dependencies
4445
sudo apt-get install gz-${{ matrix.gazebo_distro }}
46+
# Test dependencies
47+
sudo apt-get install libgtest-dev
4548
4649
- name: Cache Source-based Dependencies
4750
id: cache-source-deps

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ installing the dependencies with conda-forge on Linux, macOS or Windows, or apt
1414
Create and activate an environment with the required dependencies:
1515

1616
~~~
17-
mamba create -c conda-forge -n gsypdev libgz-sim8 yarp ycm-cmake-modules cmake ninja pkg-config cmake compilers
17+
mamba create -c conda-forge -n gsypdev libgz-sim8 yarp ycm-cmake-modules cmake ninja pkg-config cmake compilers gtest
1818
mamba activate gsypdev
1919
~~~
2020

@@ -48,7 +48,7 @@ First install some necessary dependencies from apt
4848

4949
~~~
5050
sudo apt-get update
51-
sudo apt-get install lsb-release wget gnupg cmake pkg-config ninja-build build-essential
51+
sudo apt-get install lsb-release wget gnupg cmake pkg-config ninja-build build-essential libgtest-dev
5252
~~~
5353

5454
Then install Gazebo Harmonic:

ci_env.yml

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ dependencies:
99
- pkg-config
1010
- libgz-sim8
1111
- yarp
12+
- gtest

tests/CMakeLists.txt

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
1-
# Fetch and configure GTest
2-
include(FetchContent)
3-
FetchContent_Declare(
4-
googletest
5-
URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip
6-
)
7-
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
8-
FetchContent_MakeAvailable(googletest)
1+
find_package(GTest REQUIRED)
92

103
add_subdirectory(forcetorque)
114
add_subdirectory(imu)

tests/camera/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
add_executable(CameraTest CameraTest.cc)
22
target_link_libraries(CameraTest
3-
gtest_main
3+
GTest::gtest_main
44
gz-sim${GZ_SIM_VER}::gz-sim${GZ_SIM_VER}
55
gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
66
${YARP_LIBRARIES}

tests/clock/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
add_executable(ClockTest ClockTest.cc)
22
target_link_libraries(ClockTest
3-
gtest_main
3+
GTest::gtest_main
44
gz-sim${GZ_SIM_VER}::gz-sim${GZ_SIM_VER}
55
gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
66
YARP::YARP_dev

tests/commons/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ add_executable(ConfigurationParsingTest ConfigurationParsingTest.cc)
22

33
target_link_libraries(ConfigurationParsingTest
44
PRIVATE
5-
gtest_main
5+
GTest::gtest_main
66
gz-sim${GZ_SIM_VER}::gz-sim${GZ_SIM_VER}
77
gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
88
YARP::YARP_dev

tests/controlboard/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ foreach(TEST ${TESTS})
99
add_executable(${TEST} ${TEST}.cc)
1010

1111
target_link_libraries(${TEST}
12-
PRIVATE gtest_main
12+
PRIVATE GTest::gtest_main
1313
PRIVATE gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
1414
PRIVATE gz-sim${GZ_SIM_VER}::gz-sim${GZ_SIM_VER}
1515
PRIVATE

tests/forcetorque/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
add_executable(ForceTorqueTest ForceTorqueTest.cc)
22
target_link_libraries(ForceTorqueTest
3-
gtest_main
3+
GTest::gtest_main
44
gz-sim${GZ_SIM_VER}::gz-sim${GZ_SIM_VER}
55
gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
66
${YARP_LIBRARIES}

tests/imu/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
add_executable(ImuTest ImuTest.cc)
22
target_link_libraries(ImuTest
3-
PRIVATE gtest_main
3+
PRIVATE GTest::gtest_main
44
PRIVATE gz-sim${GZ_SIM_VER}::gz-sim${GZ_SIM_VER}
55
PRIVATE gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
66
PRIVATE

tests/laser/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
add_executable(LaserTest LaserTest.cc)
22
target_link_libraries(LaserTest
3-
gtest_main
3+
GTest::gtest_main
44
gz-sim${GZ_SIM_VER}::gz-sim${GZ_SIM_VER}
55
gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
66
${YARP_LIBRARIES}

0 commit comments

Comments
 (0)