Commit62269d2

authored and

committed

Fix MSVC build

1 parentb886faa commit62269d2Copy full SHA for 62269d2

File tree

-2

lines changed

-2

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,11 @@ cmake_minimum_required(VERSION 2.8)`
`7`	`7`	`cmake_policy(SET CMP0048 NEW)# The project() command manages VERSION variables.`
`8`	`8`	`project(CPP-NETLIBVERSION 0.11.1)`
`9`	`9`
`10`		`-option( CPP-NETLIB_BUILD_SHARED_LIBS"Build cpp-netlib as shared libraries."ON )`
	`10`	`+if(MSVC)`
	`11`	`+ option( CPP-NETLIB_BUILD_SHARED_LIBS"Build cpp-netlib as shared libraries."OFF)`
	`12`	`+else()`
	`13`	`+ option( CPP-NETLIB_BUILD_SHARED_LIBS"Build cpp-netlib as shared libraries."ON)`
	`14`	`+endif()`
`11`	`15`	`option( CPP-NETLIB_BUILD_TESTS"Build the cpp-netlib project tests."OFF)`
`12`	`16`	`option( CPP-NETLIB_BUILD_EXPERIMENTS"Build the cpp-netlib project experiments."OFF)`
`13`	`17`	`option( CPP-NETLIB_BUILD_EXAMPLES"Build the cpp-netlib project examples."OFF)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ struct socket_options_base {`
`33`	`33`	`receive_low_watermark(options.receive_low_watermark()),`
`34`	`34`	`send_low_watermark(options.send_low_watermark()),`
`35`	`35`	`non_blocking_io(options.non_blocking_io()),`
`36`		`- linger(options.linger(), options.linger_timeout()) {}`
	`36`	`+ linger(options.linger(),int(options.linger_timeout())) {}`
`37`	`37`
`38`	`38`	`voidacceptor_options(boost::asio::ip::tcp::acceptor &acceptor) {`
`39`	`39`	`acceptor.set_option(acceptor_reuse_address);`

Comments

(0)