NotificationsYou must be signed in to change notification settings
Fork425
Star2k

Commit01589b6

committed

Simplifying the CMakeLists files.

1 parent21ccfb6 commit01589b6Copy full SHA for 01589b6

File tree

4 files changed

+10

-22

lines changed

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

4 files changed

+10

-22

lines changed

`‎CMakeLists.txt‎`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,11 @@`
`5`	`5`
`6`	`6`	`cmake_minimum_required(VERSION 2.6)`
`7`	`7`	`project(CPP-NETLIB)`
`8`		`-find_package( Boost 1.41.0 )`
	`8`	`+find_package( Boost 1.43.0 REQUIRED unit_test_frameworksystemregex date_time thread filesystem )`
	`9`	`+find_package( OpenSSL )`
	`10`	`+find_package( Threads )`
	`11`	`+set(Boost_USE_STATIC_LIBSON)`
	`12`	`+set(Boost_USE_MULTITHREADEDON)`
`9`	`13`	`set(CMAKE_VERBOSE_MAKEFILEtrue)`
`10`	`14`
`11`	`15`	`if (CMAKE_BUILD_TYPEMATCHES Debug)`

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

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,7 @@`
`4`	`4`	`# http://www.boost.org/LICENSE_1_0.txt)`
`5`	`5`
`6`	`6`	`include_directories(${CPP-NETLIB_SOURCE_DIR})`
`7`		`-find_package( Boost 1.41.0 COMPONENTS program_optionssystemregex date_time thread filesystem )`
`8`		`-find_package( OpenSSL )`
`9`	`7`	`include_directories(${OPENSSL_INCLUDE_DIR})`
`10`		`-find_package( Threads )`
`11`		`-set(Boost_USE_STATIC_LIBSON)`
`12`		`-set(Boost_USE_MULTITHREADEDON)`
`13`	`8`
`14`	`9`	`if (Boost_FOUND)`
`15`	`10`	`add_executable(http_client http_client.cpp)`

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

Lines changed: 5 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,6 @@`
`4`	`4`	`# http://www.boost.org/LICENSE_1_0.txt)`
`5`	`5`
`6`	`6`	`include_directories(${CPP-NETLIB_SOURCE_DIR})`
`7`		`-find_package( Boost 1.41.0 COMPONENTS unit_test_frameworksystemregex date_time thread filesystem )`
`8`		`-find_package( OpenSSL )`
`9`		`-find_package( Threads )`
`10`		`-set(Boost_USE_STATIC_LIBSON)`
`11`		`-set(Boost_USE_MULTITHREADEDON)`
`12`	`7`
`13`	`8`	`add_subdirectory(uri)`
`14`	`9`	`add_subdirectory(http)`
`@@ -24,17 +19,17 @@ if (Boost_FOUND)`
`24`	`19`	`set_source_files_properties(${test}.cpp`
`25`	`20`	`PROPERTIESCOMPILE_FLAGS"-Wall")`
`26`	`21`	`add_executable(cpp-netlib-${test}${test}.cpp)`
`27`		`-add_dependencies(cpp-netlib-${test} cppnetlib-uri-parsers)`
	`22`	`+add_dependencies(cpp-netlib-${test} cppnetlib-uri-parsers)`
`28`	`23`
`29`		`-# add_dependencies(cpp-netlib-${test} cppnetlib-uri-parsers)`
`30`		`-# target_link_libraries(cpp-netlib-${test} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri-parsers)`
`31`		`- target_link_libraries(cpp-netlib-${test}${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri-parsers)`
	`24`	`+ target_link_libraries(cpp-netlib-${test}`
	`25`	`+${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri-parsers)`
`32`	`26`	`if (OPENSSL_FOUND)`
`33`	`27`	`target_link_libraries(cpp-netlib-${test}${OPENSSL_LIBRARIES})`
`34`	`28`	`endif()`
`35`	`29`	`set_target_properties(cpp-netlib-${test}`
`36`	`30`	`PROPERTIESRUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)`
`37`		`- add_test(cpp-netlib-${test} ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-${test})`
	`31`	`+ add_test(cpp-netlib-${test}`
	`32`	`+ ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-${test})`
`38`	`33`	`endforeach (test)`
`39`	`34`
`40`	`35`	`endif()`

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

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,18 +5,12 @@`
`5`	`5`	`# http://www.boost.org/LICENSE_1_0.txt)`
`6`	`6`
`7`	`7`	`include_directories(${CPP-NETLIB_SOURCE_DIR})`
`8`		`-find_package( Boost 1.43.0 REQUIRED unit_test_frameworksystemregex thread filesystem )`
`9`		`-find_package( OpenSSL )`
`10`	`8`
`11`	`9`	`if (OPENSSL_FOUND)`
`12`	`10`	`include_directories(${OPENSSL_INCLUDE_DIR} )`
`13`	`11`	`add_definitions(-DBOOST_NETWORK_ENABLE_HTTPS)`
`14`	`12`	`endif()`
`15`	`13`
`16`		`-find_package( Threads )`
`17`		`-set(Boost_USE_STATIC_LIBSON)`
`18`		`-set(Boost_USE_MULTITHREADEDON)`
`19`		`-`
`20`	`14`	`if (Boost_FOUND)`
`21`	`15`	`set ( TESTS`
`22`	`16`	`client_constructor_test`

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!

Commit01589b6

File tree

4 files changed

4 files changed

`‎CMakeLists.txt‎`

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

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

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

0 commit comments