File tree Expand file tree Collapse file tree 6 files changed +13
-18
lines changed
contrib/googletest-1.10.x/googletest/generated Expand file tree Collapse file tree 6 files changed +13
-18
lines changed Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ endmacro()
24
24
25
25
####################################################################################
26
26
include (CMakeFindDependencyMacro )
27
- if (ON )
27
+ if ()
28
28
set (THREADS_PREFER_PTHREAD_FLAG )
29
29
find_dependency (Threads )
30
30
endif ()
Original file line number Diff line number Diff line change @@ -30,11 +30,6 @@ else()
30
30
endif ()
31
31
32
32
33
- # if the installed project requested no architecture check, don't perform the check
34
- if ("FALSE" )
35
- return ()
36
- endif ()
37
-
38
33
# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
39
34
if ("${CMAKE_SIZEOF_VOID_P} " STREQUAL "" OR "8" STREQUAL "" )
40
35
return ()
Original file line number Diff line number Diff line change 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
3
3
4
4
Name: gmock
5
5
Description: GoogleMock (without main() function)
6
6
Version: 1.14.0
7
7
URL: https://github.com/google/googletest
8
8
Requires: gtest = 1.14.0
9
9
Libs: -L${libdir} -lgmock
10
- Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1
10
+ Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=0
Original file line number Diff line number Diff line change 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
3
3
4
4
Name: gmock_main
5
5
Description: GoogleMock (with main() function)
6
6
Version: 1.14.0
7
7
URL: https://github.com/google/googletest
8
8
Requires: gmock = 1.14.0
9
9
Libs: -L${libdir} -lgmock_main
10
- Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1
10
+ Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=0
Original file line number Diff line number Diff line change 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
3
3
4
4
Name: gtest
5
5
Description: GoogleTest (without main() function)
6
6
Version: 1.14.0
7
7
URL: https://github.com/google/googletest
8
8
Libs: -L${libdir} -lgtest
9
- Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1
9
+ Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=0
Original file line number Diff line number Diff line change 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
3
3
4
4
Name: gtest_main
5
5
Description: GoogleTest (with main() function)
6
6
Version: 1.14.0
7
7
URL: https://github.com/google/googletest
8
8
Requires: gtest = 1.14.0
9
9
Libs: -L${libdir} -lgtest_main
10
- Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1
10
+ Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=0
You can’t perform that action at this time.
0 commit comments