Commitb9138f5

committed

Added gmock dependency.

1 parent396214f commitb9138f5Copy full SHA for b9138f5

File tree

+16

-1

lines changed

+16

-1

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,3 +4,6 @@`
`4`	`4`	`[submodule "uri"]`
`5`	`5`	`path=uri`
`6`	`6`	`url=git://github.com/cpp-netlib/uri`
	`7`	`+[submodule "deps/gmock"]`
	`8`	`+path=deps/gmock`
	`9`	`+url=git://github.com/cpp-netlib/gmock`

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -97,16 +97,27 @@ if(CPP-NETLIB_BUILD_TESTS)`
`97`	`97`	`if(MSVC11)`
`98`	`98`	`add_definitions(-D_VARIADIC_MAX=10)`
`99`	`99`	`endif(MSVC11)`
	`100`	`+`
`100`	`101`	`if(MSVC)`
`101`	`102`	`set(gtest_force_shared_crtONCACHEBOOL"Override gtest option.")`
`102`	`103`	`endif(MSVC)`
`103`		`- add_subdirectory(deps/gtest)`
	`104`	`+`
	`105`	`+# gmock automatically searches for gtest`
	`106`	`+ add_subdirectory(deps/gmock)`
	`107`	`+`
`104`	`108`	`set(GTEST_ROOT ${CPP-NETLIB_SOURCE_DIR}/deps/gtest)`
`105`	`109`	`set(GTEST_FOUNDON)`
`106`	`110`	`set(GTEST_INCLUDE_DIRS${GTEST_ROOT}/include)`
`107`	`111`	`set(GTEST_LIBRARIES gtest)`
`108`	`112`	`set(GTEST_MAIN_LIBRARIES gtest_main)`
`109`	`113`	`set(GTEST_BOTH_LIBRARIES${GTEST_LIBRARIES}${GTEST_MAIN_LIBRARIES})`
	`114`	`+`
	`115`	`+ set(GMOCK_ROOT ${CPP-NETLIB_SOURCE_DIR}/deps/gmock)`
	`116`	`+ set(GMOCK_FOUNDON)`
	`117`	`+ set(GMOCK_INCLUDE_DIRS${GTEST_INCLUDE_DIRS} {${GMOCK_DIR}/include)`
	`118`	`+ set(GMOCK_LIBRARIES {$GTEST_LIBRARIES} gmock)`
	`119`	`+ set(GMOCK_MAIN_LIBRARIES gmock_main)`
	`120`	`+ set(GMOCK_BOTH_LIBRARIES${GMOCK_LIBRARIES}${GMOCK_MAIN_LIBRARIES})`
`110`	`121`	`endif()`
`111`	`122`
`112`	`123`	`add_subdirectory(uri)`

Submodule gmock added at6b1759c

Comments

(0)