Skip to content

Commit 4c630d4

Browse files
zflatWilliam Wedler
and
William Wedler
authored
set search path args and then append (#543)
Fix appending search paths specified by GTEST_DIR that was being overridden by the set command for system paths Signed-off-by: William Wedler <[email protected]> Co-authored-by: William Wedler <[email protected]>
1 parent 446e3ed commit 4c630d4

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

ament_cmake_gtest/ament_cmake_gtest-extras.cmake

+3-6
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,16 @@ macro(_ament_cmake_gtest_find_gtest)
2424
# if gtest sources were not found in a previous run
2525
if(NOT GTEST_FROM_SOURCE_FOUND)
2626
# search path for gtest includes and sources
27-
set(_search_path_include "")
28-
set(_search_path_src "")
27+
# check the system installed path (i.e. on Ubuntu)
28+
set(_search_path_include "/usr/include/gtest")
29+
set(_search_path_src "/usr/src/gtest/src")
2930

3031
# option() consider environment variable to find gtest
3132
if(NOT $ENV{GTEST_DIR} STREQUAL "")
3233
list(APPEND _search_path_include "$ENV{GTEST_DIR}/include/gtest")
3334
list(APPEND _search_path_src "$ENV{GTEST_DIR}/src")
3435
endif()
3536

36-
# check to system installed path (i.e. on Ubuntu)
37-
set(_search_path_include "/usr/include/gtest")
38-
set(_search_path_src "/usr/src/gtest/src")
39-
4037
# check gtest_vendor path, prefer this version over a system installed
4138
find_package(gtest_vendor QUIET)
4239
if(gtest_vendor_FOUND AND gtest_vendor_BASE_DIR)

0 commit comments

Comments
 (0)