Commita4057db

committed

Replaced BOOST_DYN_LINK code with the same options that appear on the master branch (CPP-NETLIB_BUILD_SHARED_LIBS).

1 parentc5efecc commita4057dbCopy full SHA for a4057db

File tree

+20

-14

lines changed

+20

-14

lines changed

Lines changed: 9 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,15 +6,18 @@`
`6`	`6`	`cmake_minimum_required(VERSION 2.8)`
`7`	`7`	`project(CPP-NETLIB)`
`8`	`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)`
	`9`	`+option( CPP-NETLIB_BUILD_SHARED_LIBS"Build cpp-netlib as shared libraries."OFF )`
	`10`	`+`
	`11`	`+if(CPP-NETLIB_BUILD_SHARED_LIBSORBUILD_SHARED_LIBS)`
`13`	`12`	`message ("Linking boost testing libs dynamically...")`
	`13`	`+ set(Boost_USE_STATIC_LIBSOFF)`
	`14`	`+ set(CPP-NETLIB_BUILD_SHARED_LIBSON)`
`14`	`15`	`add_definitions(-DBOOST_TEST_DYN_LINK)`
`15`		`-elseif (BOOST_DYN_LINK)`
	`16`	`+else()`
`16`	`17`	`set(Boost_USE_STATIC_LIBSON)`
`17`		`-endif(BOOST_DYN_LINK)`
	`18`	`+ set(CPP-NETLIB_BUILD_SHARED_LIBSOFF)`
	`19`	`+ set(BUILD_SHARED_LIBSOFF)`
	`20`	`+endif()`
`18`	`21`
`19`	`22`	`set(Boost_USE_MULTI_THREADEDON)`
`20`	`23`	`find_package( Boost 1.45.0 REQUIRED unit_test_frameworksystemregex date_time thread filesystem program_options chrono )`

Lines changed: 11 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,15 +2,18 @@ include_directories(${CPP-NETLIB_SOURCE_DIR})`
`2`	`2`	`find_package ( Boost 1.41.0 COMPONENTS unit_test_framework )`
`3`	`3`	`file ( COPY TestMessagesDESTINATION${CMAKE_CURRENT_BINARY_DIR} )`
`4`	`4`
`5`		`-option (BOOST_DYN_LINK`
`6`		`-"Build the project using dynamic linking for the boost test libs"`
`7`		`-OFF)`
`8`		`-if (BOOST_DYN_LINK)`
`9`		`- message ("Do not try to link boost test libs dynamically for this test...")`
`10`		`- remove_definitions(-DBOOST_TEST_DYN_LINK)`
`11`		`-elseif (BOOST_DYN_LINK)`
	`5`	`+option( CPP-NETLIB_BUILD_SHARED_LIBS"Build cpp-netlib as shared libraries."OFF )`
	`6`	`+`
	`7`	`+if(CPP-NETLIB_BUILD_SHARED_LIBSORBUILD_SHARED_LIBS)`
	`8`	`+ message ("Linking boost testing libs dynamically...")`
	`9`	`+ set(Boost_USE_STATIC_LIBSOFF)`
	`10`	`+ set(CPP-NETLIB_BUILD_SHARED_LIBSON)`
	`11`	`+ add_definitions(-DBOOST_TEST_DYN_LINK)`
	`12`	`+else()`
`12`	`13`	`set(Boost_USE_STATIC_LIBSON)`
`13`		`-endif(BOOST_DYN_LINK)`
	`14`	`+ set(CPP-NETLIB_BUILD_SHARED_LIBSOFF)`
	`15`	`+ set(BUILD_SHARED_LIBSOFF)`
	`16`	`+endif()`
`14`	`17`
`15`	`18`	`set ( Boost_USE_MULTITHREADEDON )`
`16`	`19`

Comments

(0)