Skip to content

Commit c278054

Browse files
authored
Don't use gtest_main and gflags_nothreads (#316)
1 parent 1c0b39a commit c278054

2 files changed

Lines changed: 1 addition & 5 deletions

File tree

CMake/Findgflags.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
find_path(GFLAGS_INCLUDE_DIRS gflags/gflags.h)
22

3-
find_library(GFLAGS_LIBRARIES gflags_nothreads)
3+
find_library(GFLAGS_LIBRARIES gflags)
44

55
find_package_handle_standard_args(gflags DEFAULT_MSG GFLAGS_LIBRARIES GFLAGS_INCLUDE_DIRS)
66

CMake/Findgoogletest.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
find_path(GOOGLETEST_INCLUDE_DIRS gtest/gtest.h gmock/gmock.h)
22

33
find_library(GOOGLETEST_GTEST_LIBRARIES gtest)
4-
find_library(GOOGLETEST_GTEST_MAIN_LIBRARIES gtest_main)
54
find_library(GOOGLETEST_GMOCK_LIBRARIES gmock)
6-
find_library(GOOGLETEST_GMOCK_MAIN_LIBRARIES gmock_main)
75

86
set(GOOGLETEST_LIBRARIES
97
${GOOGLETEST_GTEST_LIBRARIES}
10-
${GOOGLETEST_GTEST_MAIN_LIBRARIES}
118
${GOOGLETEST_GMOCK_LIBRARIES}
12-
${GOOGLETEST_GMOCK_MAIN_LIBRARIES}
139
)
1410

1511
find_package_handle_standard_args(googletest DEFAULT_MSG GOOGLETEST_LIBRARIES GOOGLETEST_INCLUDE_DIRS)

0 commit comments

Comments
 (0)