Commitd9d6945

committed

Merge pull requestcpp-netlib#325 from patriotyk/master

Reordered linking of static libraries (-lpthread should be after the static library).

2 parents8df1f1c +1b5a013 commitd9d6945Copy full SHA for d9d6945

File tree

-8

lines changed

-8

lines changed

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,8 @@ else()`
`58`	`58`	`endif()`
`59`	`59`	`target_link_libraries(simple_wget`
`60`	`60`	`${BOOST_CLIENT_LIBS}`
`61`		`-${CMAKE_THREAD_LIBS_INIT}`
`62`		`-${simple_wget_linklibs})`
	`61`	`+${simple_wget_linklibs}`
	`62`	`+${CMAKE_THREAD_LIBS_INIT})`
`63`	`63`
`64`	`64`	`if(CPP-NETLIB_BUILD_SINGLE_LIB)`
`65`	`65`	`set(atom_reader_linklibs cppnetlib)`
`@@ -78,8 +78,8 @@ else()`
`78`	`78`	`endif()`
`79`	`79`	`target_link_libraries(atom_reader`
`80`	`80`	`${BOOST_CLIENT_LIBS}`
`81`		`-${CMAKE_THREAD_LIBS_INIT}`
`82`		`-${atom_reader_linklibs})`
	`81`	`+${atom_reader_linklibs}`
	`82`	`+${CMAKE_THREAD_LIBS_INIT})`
`83`	`83`
`84`	`84`	`if(CPP-NETLIB_BUILD_SINGLE_LIB)`
`85`	`85`	`set(rss_reader_linklibs cppnetlib)`
`@@ -97,8 +97,8 @@ else()`
`97`	`97`	`endif()`
`98`	`98`	`target_link_libraries(rss_reader`
`99`	`99`	`${BOOST_CLIENT_LIBS}`
`100`		`-${CMAKE_THREAD_LIBS_INIT}`
`101`		`-${rss_reader_linklibs})`
	`100`	`+${rss_reader_linklibs}`
	`101`	`+${CMAKE_THREAD_LIBS_INIT})`
`102`	`102`
`103`	`103`	`#target_link_libraries(twitter_search`
`104`	`104`	`# ${BOOST_CLIENT_LIBS}`
`@@ -138,8 +138,8 @@ else()`
`138`	`138`	`endif()`
`139`	`139`	`target_link_libraries(hello_world_client`
`140`	`140`	`${BOOST_CLIENT_LIBS}`
`141`		`-${CMAKE_THREAD_LIBS_INIT}`
`142`		`-${hello_world_client_linklibs})`
	`141`	`+${hello_world_client_linklibs}`
	`142`	`+${CMAKE_THREAD_LIBS_INIT})`
`143`	`143`
`144`	`144`	`if (OPENSSL_FOUND)`
`145`	`145`	`target_link_libraries(simple_wget${OPENSSL_LIBRARIES})`

Comments

(0)