From 804175075864c23e68d4945caf2ec93523a43f22 Mon Sep 17 00:00:00 2001 From: Chuck Atkins <chuck.atkins@kitware.com> Date: Wed, 26 Apr 2017 09:26:24 -0400 Subject: [PATCH] Fix pthread linkage for googletest --- thirdparty/GTest/CMakeLists.txt | 5 ----- thirdparty/GTest/googletest/googletest/CMakeLists.txt | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/thirdparty/GTest/CMakeLists.txt b/thirdparty/GTest/CMakeLists.txt index d4408110e..dc8e16134 100644 --- a/thirdparty/GTest/CMakeLists.txt +++ b/thirdparty/GTest/CMakeLists.txt @@ -2,8 +2,3 @@ set(BUILD_GTEST ON) set(BUILD_GMOCK OFF) add_subdirectory(googletest) - -# Fix missing usage requirements -target_include_directories(gtest - INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/googletest/googletest/include -) diff --git a/thirdparty/GTest/googletest/googletest/CMakeLists.txt b/thirdparty/GTest/googletest/googletest/CMakeLists.txt index f8f5e582e..c7513c14b 100644 --- a/thirdparty/GTest/googletest/googletest/CMakeLists.txt +++ b/thirdparty/GTest/googletest/googletest/CMakeLists.txt @@ -96,6 +96,9 @@ cxx_library(gtest "${cxx_strict}" src/gtest-all.cc) cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc) target_link_libraries(gtest_main gtest) +find_package(Threads REQUIRED) +target_link_libraries(gtest ${CMAKE_THREAD_LIBS_INIT}) + # If the CMake version supports it, attach header directory information # to the targets for when we are part of a parent build (ie being pulled # in via add_subdirectory() rather than being a standalone build). -- GitLab