Commit4260d6d

committed

Linking gmock as a shared library causes some weird crashes, so I'll disable it now.

1 parentcdbc67b commit4260d6dCopy full SHA for 4260d6d

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ include_directories(`
`12`	`12`	`${CPP-NETLIB_SOURCE_DIR}/logging/src`
`13`	`13`	`${CPP-NETLIB_SOURCE_DIR}/http/src`
`14`	`14`	`${GTEST_INCLUDE_DIRS}`
`15`		`-${GMOCK_INCLUDE_DIRS}`
	`15`	`+#${GMOCK_INCLUDE_DIRS}`
`16`	`16`	`${IGLOO_INCLUDE_DIR}`
`17`	`17`	`${CPP-NETLIB_SOURCE_DIR})`
`18`	`18`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,12 @@`
`6`	`6`	`set(CPP-NETLIB_CLIENT_TESTS`
`7`	`7`	`client_options_test`
`8`	`8`	`client_test`
`9`		`- client_resolution_test`
	`9`	`+#client_resolution_test`
`10`	`10`	`request_options_test`
`11`	`11`	`byte_source_test`
`12`	`12`	`request_test`
`13`	`13`	`response_test`
`14`		`- response_parser_test`
	`14`	`+#response_parser_test`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`foreach(test ${CPP-NETLIB_CLIENT_TESTS})`
`@@ -25,7 +25,8 @@ foreach(test ${CPP-NETLIB_CLIENT_TESTS})`
`25`	`25`	`network-uri`
`26`	`26`	`network-http-v2-client`
`27`	`27`	`${Boost_LIBRARIES}`
`28`		`-${GMOCK_BOTH_LIBRARIES}`
	`28`	`+#${GMOCK_BOTH_LIBRARIES}`
	`29`	`+${GTEST_BOTH_LIBRARIES}`
`29`	`30`	`${ICU_LIBRARIES}${ICU_I18N_LIBRARIES}`
`30`	`31`	`${CMAKE_THREAD_LIBS_INIT}`
`31`	`32`	`)`

Comments

(0)