Skip to content

Commit 508da92

Browse files
committed
Enable linkage
1 parent 826cb17 commit 508da92

File tree

6 files changed

+13
-18
lines changed

6 files changed

+13
-18
lines changed

contrib/googletest-1.10.x/googletest/generated/GTestConfig.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ endmacro()
2424

2525
####################################################################################
2626
include(CMakeFindDependencyMacro)
27-
if (ON)
27+
if ()
2828
set(THREADS_PREFER_PTHREAD_FLAG )
2929
find_dependency(Threads)
3030
endif()

contrib/googletest-1.10.x/googletest/generated/GTestConfigVersion.cmake

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ else()
3030
endif()
3131

3232

33-
# if the installed project requested no architecture check, don't perform the check
34-
if("FALSE")
35-
return()
36-
endif()
37-
3833
# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
3934
if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
4035
return()
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
libdir=/usr/local/lib
2-
includedir=/usr/local/include
1+
libdir=C:/Program Files (x86)/osre/lib
2+
includedir=C:/Program Files (x86)/osre/include
33

44
Name: gmock
55
Description: GoogleMock (without main() function)
66
Version: 1.14.0
77
URL: https://github.com/google/googletest
88
Requires: gtest = 1.14.0
99
Libs: -L${libdir} -lgmock
10-
Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1
10+
Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=0
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
libdir=/usr/local/lib
2-
includedir=/usr/local/include
1+
libdir=C:/Program Files (x86)/osre/lib
2+
includedir=C:/Program Files (x86)/osre/include
33

44
Name: gmock_main
55
Description: GoogleMock (with main() function)
66
Version: 1.14.0
77
URL: https://github.com/google/googletest
88
Requires: gmock = 1.14.0
99
Libs: -L${libdir} -lgmock_main
10-
Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1
10+
Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=0
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
libdir=/usr/local/lib
2-
includedir=/usr/local/include
1+
libdir=C:/Program Files (x86)/osre/lib
2+
includedir=C:/Program Files (x86)/osre/include
33

44
Name: gtest
55
Description: GoogleTest (without main() function)
66
Version: 1.14.0
77
URL: https://github.com/google/googletest
88
Libs: -L${libdir} -lgtest
9-
Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1
9+
Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=0
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
libdir=/usr/local/lib
2-
includedir=/usr/local/include
1+
libdir=C:/Program Files (x86)/osre/lib
2+
includedir=C:/Program Files (x86)/osre/include
33

44
Name: gtest_main
55
Description: GoogleTest (with main() function)
66
Version: 1.14.0
77
URL: https://github.com/google/googletest
88
Requires: gtest = 1.14.0
99
Libs: -L${libdir} -lgtest_main
10-
Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1
10+
Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=0

0 commit comments

Comments
 (0)