NotificationsYou must be signed in to change notification settings
Fork425
Star2k

Commite2c257f

committed

Fixed CMake scripts for MSVC 10.0

1 parent0ab08fc commite2c257fCopy full SHA for e2c257f

File tree

2 files changed

+15

-10

lines changed

libs/network
- example
  - CMakeLists.txt
- test/http
  - CMakeLists.txt

2 files changed

+15

-10

lines changed

`‎libs/network/example/CMakeLists.txt‎`

Lines changed: 12 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,19 +11,24 @@ endif (OPENSSL_FOUND)`
`11`	`11`	`add_executable(http_client http_client.cpp)`
`12`	`12`	`add_executable(simple_wget simple_wget.cpp)`
`13`	`13`	`add_executable(hello_world_server http/hello_world_server.cpp)`
`14`		`-add_executable(fileserver http/fileserver.cpp)`
	`14`	`+if (UNIX)`
	`15`	`+ add_executable(fileserver http/fileserver.cpp)`
	`16`	`+endif (UNIX)`
`15`	`17`	`add_executable(uri uri.cpp)`
`16`	`18`	`add_dependencies(http_client cppnetlib-uri cppnetlib-client-connections)`
`17`	`19`	`add_dependencies(simple_wget cppnetlib-uri cppnetlib-client-connections)`
`18`	`20`	`add_dependencies(uri cppnetlib-uri)`
`19`	`21`	`set(BOOST_CLIENT_LIBS`
`20`	`22`	`${Boost_PROGRAM_OPTIONS_LIBRARY}`
`21`	`23`	`${Boost_THREAD_LIBRARY}`
	`24`	`+${Boost_DATE_TIME_LIBRARY}`
	`25`	`+${Boost_REGEX_LIBRARY}`
`22`	`26`	`${Boost_SYSTEM_LIBRARY})`
`23`	`27`
`24`	`28`	`set(BOOST_SERVER_LIBS`
`25`	`29`	`${Boost_THREAD_LIBRARY}`
`26`	`30`	`${Boost_SYSTEM_LIBRARY}`
	`31`	`+${Boost_DATE_TIME_LIBRARY}`
`27`	`32`	`${Boost_PROGRAM_OPTIONS_LIBRARY})`
`28`	`33`
`29`	`34`	`target_link_libraries(http_client`
`@@ -48,15 +53,19 @@ if (OPENSSL_FOUND)`
`48`	`53`	`target_link_libraries(hello_world_server${OPENSSL_LIBRARIES})`
`49`	`54`	`endif (OPENSSL_FOUND)`
`50`	`55`
`51`		`-target_link_libraries(fileserver`
	`56`	`+if (UNIX)`
	`57`	`+ target_link_libraries(fileserver`
`52`	`58`	`${BOOST_SERVER_LIBS}`
`53`	`59`	`${Boost_FILESYSTEM_LIBRARY}`
`54`	`60`	`${CMAKE_THREAD_LIBS_INIT}`
`55`	`61`	`cppnetlib-server-parsers)`
	`62`	`+endif (UNIX)`
`56`	`63`
`57`	`64`	`target_link_libraries(uri cppnetlib-uri)`
`58`	`65`	`set_target_properties(http_client PROPERTIESRUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)`
`59`	`66`	`set_target_properties(simple_wget PROPERTIESRUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)`
`60`	`67`	`set_target_properties(hello_world_server PROPERTIESRUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)`
`61`		`-set_target_properties(fileserver PROPERTIESRUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)`
	`68`	`+if (UNIX)`
	`69`	`+ set_target_properties(fileserver PROPERTIESRUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)`
	`70`	`+endif (UNIX)`
`62`	`71`	`set_target_properties(uri PROPERTIESRUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)`

`‎libs/network/test/http/CMakeLists.txt‎`

Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,6 @@ if (OPENSSL_FOUND)`
`13`	`13`	`endif()`
`14`	`14`
`15`	`15`	`if (Boost_FOUND)`
`16`		`- set ( BOOST_LIBS`
`17`		`-${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}`
`18`		`-${Boost_THREAD_LIBRARY}`
`19`		`-${Boost_SYSTEM_LIBRARY})`
`20`	`16`	`set ( TESTS`
`21`	`17`	`client_constructor_test`
`22`	`18`	`client_get_test`
`@@ -34,7 +30,7 @@ if (Boost_FOUND)`
`34`	`30`	`cppnetlib-uri`
`35`	`31`	`cppnetlib-client-connections)`
`36`	`32`	`target_link_libraries(cpp-netlib-http-${test}`
`37`		`-${BOOST_LIBS}${CMAKE_THREAD_LIBS_INIT}`
	`33`	`+${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT}`
`38`	`34`	`cppnetlib-uri`
`39`	`35`	`cppnetlib-client-connections)`
`40`	`36`	`if (OPENSSL_FOUND)`
`@@ -57,7 +53,7 @@ if (Boost_FOUND)`
`57`	`53`	`endif()`
`58`	`54`	`add_executable(cpp-netlib-http-${test}${test}.cpp)`
`59`	`55`	`add_dependencies(cpp-netlib-http-${test} cppnetlib-server-parsers)`
`60`		`- target_link_libraries(cpp-netlib-http-${test}${BOOST_LIBS}${CMAKE_THREAD_LIBS_INIT} cppnetlib-server-parsers)`
	`56`	`+ target_link_libraries(cpp-netlib-http-${test}${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT} cppnetlib-server-parsers)`
`61`	`57`	`set_target_properties(cpp-netlib-http-${test}`
`62`	`58`	`PROPERTIESRUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)`
`63`	`59`	`add_test(cpp-netlib-http-${test}`
`@@ -78,7 +74,7 @@ if (Boost_FOUND)`
`78`	`74`	`# endif()`
`79`	`75`	`# add_executable(cpp-netlib-http-${test} ${test}.cpp)`
`80`	`76`	`# add_dependencies(cpp-netlib-http-${test} cppnetlib-server-parsers)`
`81`		`-# target_link_libraries(cpp-netlib-http-${test} ${BOOST_LIBS} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-server-parsers)`
	`77`	`+# target_link_libraries(cpp-netlib-http-${test} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-server-parsers)`
`82`	`78`	`# set_target_properties(cpp-netlib-http-${test}`
`83`	`79`	`# PROPERTIES RUNTIME_OUTPUT_DIRECTORY`
`84`	`80`	`# ${CPP-NETLIB_BINARY_DIR}/tests)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite2c257f

File tree

2 files changed

2 files changed

`‎libs/network/example/CMakeLists.txt‎`

`‎libs/network/test/http/CMakeLists.txt‎`

0 commit comments