Commitc31e693

committed

Merge pull request#270 from tjadevries/0.9-devel

Support Boost dynamic linking tests.

2 parentsa5feaa6 +dd2d96c commitc31e693Copy full SHA for c31e693

File tree

+28

-2

lines changed

+28

-2

lines changed

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,17 @@`
`5`	`5`
`6`	`6`	`cmake_minimum_required(VERSION2.8)`
`7`	`7`	`project(CPP-NETLIB)`
`8`		`-set(Boost_USE_STATIC_LIBSON)`
	`8`	`+`
	`9`	`+option (BOOST_DYN_LINK`
	`10`	`+"Build the project using dynamic linking for the boost testing libs"`
	`11`	`+OFF)`
	`12`	`+if (BOOST_DYN_LINK)`
	`13`	`+message ("Linking boost testing libs dynamically...")`
	`14`	`+add_definitions(-DBOOST_TEST_DYN_LINK)`
	`15`	`+elseif (BOOST_DYN_LINK)`
	`16`	`+set(Boost_USE_STATIC_LIBSON)`
	`17`	`+endif(BOOST_DYN_LINK)`
	`18`	`+`
`9`	`19`	`set(Boost_USE_MULTI_THREADEDON)`
`10`	`20`	`find_package(Boost1.45.0REQUIREDunit_test_frameworksystemregexdate_timethreadfilesystemprogram_optionschrono )`
`11`	`21`	`find_package(OpenSSL )`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,16 @@`
`1`	`1`	`include_directories(${CPP-NETLIB_SOURCE_DIR})`
`2`	`2`	`find_package (Boost1.41.0COMPONENTSunit_test_framework )`
`3`		`-set (Boost_USE_STATIC_LIBSON )`
	`3`	`+`
	`4`	`+option (BOOST_DYN_LINK`
	`5`	`+"Build the project using dynamic linking for the boost test libs"`
	`6`	`+OFF)`
	`7`	`+if (BOOST_DYN_LINK)`
	`8`	`+message ("Do not try to link boost test libs dynamically for this test...")`
	`9`	`+remove_definitions(-DBOOST_TEST_DYN_LINK)`
	`10`	`+elseif (BOOST_DYN_LINK)`
	`11`	`+set(Boost_USE_STATIC_LIBSON)`
	`12`	`+endif(BOOST_DYN_LINK)`
	`13`	`+`
`4`	`14`	`set (Boost_USE_MULTITHREADEDON )`
`5`	`15`
`6`	`16`	`if (Boost_FOUND )`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`	`#defineBOOST_TEST_MODULE HTTP Asynchronous Server Tests`
	`2`	`+#ifdef BOOST_TEST_DYN_LINK`
	`3`	`+#defineBOOST_TEST_NO_MAIN`
	`4`	`+#endif/* BOOST_TEST_DYN_LINK*/`
`2`	`5`
`3`	`6`	`#include<boost/network/include/http/server.hpp>`
`4`	`7`	`#include<boost/test/unit_test.hpp>`
`@@ -135,3 +138,6 @@ int main(int argc, char * argv[]) {`
`135`	`138`
`136`	`139`	`return0;`
`137`	`140`	`}`
	`141`	`+#ifdef BOOST_TEST_DYN_LINK`
	`142`	`+#undef BOOST_TEST_NO_MAIN`
	`143`	`+#endif/* BOOST_TEST_DYN_LINK*/`

Comments

(0)