Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
laser
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mobile_robotics
wolf_projects
wolf_lib
plugins
laser
Commits
fe181736
Commit
fe181736
authored
3 years ago
by
Joan Vallvé Navarro
Browse files
Options
Downloads
Patches
Plain Diff
disabling gtest pthreads in cmake<3.11
parent
46c88a9b
No related branches found
No related tags found
2 merge requests
!37
After cmake and const refactor
,
!36
Resolve "Adapt to core CMakeLists.txt refactor"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
test/CMakeLists.txt
+1
-2
1 addition, 2 deletions
test/CMakeLists.txt
test/gtest/CMakeLists.txt
+8
-10
8 additions, 10 deletions
test/gtest/CMakeLists.txt
with
9 additions
and
12 deletions
test/CMakeLists.txt
+
1
−
2
View file @
fe181736
...
...
@@ -4,7 +4,7 @@ add_subdirectory(gtest)
############# USE THIS TEST AS AN EXAMPLE #################
# #
# Create a specific test executable for gtest_example #
wolf_add_gtest
(
gtest_example gtest_example.cpp
)
#
#
wolf_add_gtest(gtest_example gtest_example.cpp) #
# #
###########################################################
...
...
@@ -12,7 +12,6 @@ wolf_add_gtest(gtest_landmark_polyline gtest_landmark_polyline.cpp)
if
(
csm_FOUND
)
wolf_add_gtest
(
gtest_processor_odom_icp gtest_processor_odom_icp.cpp
)
wolf_add_gtest
(
gtest_processor_loop_closure_icp gtest_processor_loop_closure_icp.cpp
)
endif
(
csm_FOUND
)
...
...
This diff is collapsed.
Click to expand it.
test/gtest/CMakeLists.txt
+
8
−
10
View file @
fe181736
...
...
@@ -5,15 +5,7 @@ if(${CMAKE_VERSION} VERSION_LESS "3.11.0")
include
(
ExternalProject
)
set
(
GTEST_FORCE_SHARED_CRT ON
)
set
(
GTEST_DISABLE_PTHREADS OFF
)
# For some reason I need to disable PTHREADS
# with g++ (Ubuntu 4.9.3-8ubuntu2~14.04) 4.9.3
# This is a known issue for MinGW :
# https://github.com/google/shaderc/pull/174
#if(MINGW)
# set(GTEST_DISABLE_PTHREADS ON)
#endif()
set
(
GTEST_DISABLE_PTHREADS ON
)
# without this in ubuntu 18.04 we get linking errors
# Download GoogleTest
ExternalProject_Add
(
googletest
...
...
@@ -63,7 +55,13 @@ else()
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG main
)
FetchContent_MakeAvailable
(
googletest
)
#FetchContent_MakeAvailable(googletest)
# Disable installation of googletest: https://stackoverflow.com/questions/65527126/disable-install-for-fetchcontent
FetchContent_GetProperties
(
googletest
)
if
(
NOT googletest_POPULATED
)
FetchContent_Populate
(
googletest
)
add_subdirectory
(
${
googletest_SOURCE_DIR
}
${
googletest_BINARY_DIR
}
EXCLUDE_FROM_ALL
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment