Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd85820e

Browse files
committed
Merge pull requestcpp-netlib#372 from ruslo/libnames-refactor
s,cppnetlib,network,
2 parentsc87f565 +19cc4d0 commitd85820e

File tree

8 files changed

+26
-26
lines changed

8 files changed

+26
-26
lines changed

‎contrib/http_examples/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ endif (OPENSSL_FOUND)
1616

1717
set( CPP-NETLIB_LOGGING_LIB"" )
1818
if(NOT CPP-NETLIB_DISABLE_LOGGINGANDNOT CPP-NETLIB_BUILD_SINGLE_LIB)
19-
set( CPP-NETLIB_LOGGING_LIBcppnetlib-logging )
19+
set( CPP-NETLIB_LOGGING_LIBnetwork-logging )
2020
endif()
2121

2222
set(EXAMPLES
@@ -34,4 +34,4 @@ foreach(example ${EXAMPLES})
3434
${CMAKE_THREAD_LIBS_INIT}
3535
)
3636
set_target_properties(${example} PROPERTIESRUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
37-
endforeach(example)
37+
endforeach(example)

‎http/src/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,24 @@ set(CPP-NETLIB_HTTP_MESSAGE_SRCS
2424
http/response.cpp)
2525

2626
if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
27-
add_library(cppnetlib-http-message ${CPP-NETLIB_HTTP_MESSAGE_SRCS})
28-
target_link_libraries(cppnetlib-http-message
27+
add_library(network-http-message ${CPP-NETLIB_HTTP_MESSAGE_SRCS})
28+
target_link_libraries(network-http-message
2929
${Boost_LIBRARIES}
30-
cppnetlib-message)
30+
network-message)
3131
endif()
3232

3333
set(CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS
3434
http/message/wrappers.cpp)
3535

3636
if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
37-
add_library(cppnetlib-http-message-wrappers ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS})
37+
add_library(network-http-message-wrappers ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS})
3838
endif()
3939

4040
set(CPP-NETLIB_CONSTANTS_SRCS
4141
constants.cpp)
4242

4343
if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
44-
add_library(cppnetlib-constants ${CPP-NETLIB_CONSTANTS_SRCS})
44+
add_library(network-constants ${CPP-NETLIB_CONSTANTS_SRCS})
4545
endif()
4646

4747
# Server implementation files.
@@ -51,7 +51,7 @@ set(CPP-NETLIB_HTTP_SERVER_SRCS
5151
http/server/dynamic_dispatcher.cpp)
5252

5353
if (NOT CPP-NETLIB_BUILD_SINGLE_LIB)
54-
add_library(cppnetlib-http-server ${CPP-NETLIB_HTTP_SERVER_SRCS})
54+
add_library(network-http-server ${CPP-NETLIB_HTTP_SERVER_SRCS})
5555
endif()
5656

5757
# HTTP client

‎http/test/CMakeLists.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,20 @@ set( CPPNETLIB_LIBRARIES cppnetlib )
2929
set( CPPNETLIB_SERVER_LIBRARIES${CPPNETLIB_LIBRARIES} )
3030
if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
3131
set( CPPNETLIB_LIBRARIES
32-
cppnetlib-message
33-
cppnetlib-message-wrappers
34-
cppnetlib-http-message
35-
cppnetlib-http-message-wrappers
32+
network-message
33+
network-message-wrappers
34+
network-http-message
35+
network-http-message-wrappers
3636
network-uri
37-
cppnetlib-constants )
37+
network-constants )
3838

3939
# set( CPPNETLIB_CLIENT_LIBRARIES
4040
# ${CPPNETLIB_LIBRARIES}
41-
#cppnetlib-http-client
42-
#cppnetlib-http-client-connections )
41+
#network-http-client
42+
#network-http-client-connections )
4343

4444
set( CPPNETLIB_SERVER_LIBRARIES
45-
cppnetlib-http-server )
45+
network-http-server )
4646
endif()
4747

4848

‎logging/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if( NOT CPP-NETLIB_DISABLE_LOGGING )
1313

1414
# this library name is defined only if we created the target
1515
# if not then it will be empty
16-
set( CPP-NETLIB_LOGGING_LIBcppnetlib-logging )
16+
set( CPP-NETLIB_LOGGING_LIBnetwork-logging )
1717
add_definitions(-DNETWORK_ENABLE_LOGGING)
1818

1919
if(CPP-NETLIB_BUILD_TESTS)

‎logging/src/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ include_directories(${CPP-NETLIB_SOURCE_DIR}/logging/src ${CPP-NETLIB_SOURCE_DIR
88
set(CPP-NETLIB_LOGGING_SRCS
99
logging.cpp)
1010

11-
add_library(cppnetlib-logging ${CPP-NETLIB_LOGGING_SRCS})
11+
add_library(network-logging ${CPP-NETLIB_LOGGING_SRCS})
1212

1313
# prepend current directory to make paths absolute
1414
prependToElements("${CMAKE_CURRENT_SOURCE_DIR}/"

‎logging/test/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if (CPP-NETLIB_BUILD_TESTS)
1818
if(CPP-NETLIB_BUILD_SINGLE_LIB)
1919
set(link_cppnetlib_lib cppnetlib)
2020
else()
21-
set(link_cppnetlib_libcppnetlib-logging)
21+
set(link_cppnetlib_libnetwork-logging)
2222
endif()
2323
foreach (test${TESTS})
2424
if (${CMAKE_CXX_COMPILER_ID}MATCHES GNU)

‎message/src/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ include_directories(${CPP-NETLIB_SOURCE_DIR}/uri/src ${CPP-NETLIB_SOURCE_DIR}/me
1010
set(CPP-NETLIB_MESSAGE_SRCS
1111
message.cpp)
1212

13-
add_library(cppnetlib-message ${CPP-NETLIB_MESSAGE_SRCS})
14-
target_link_libraries(cppnetlib-message network-uri)
13+
add_library(network-message ${CPP-NETLIB_MESSAGE_SRCS})
14+
target_link_libraries(network-message network-uri)
1515

1616
set(CPP-NETLIB_MESSAGE_DIRECTIVES_SRCS
1717
directives.cpp)
1818

19-
add_library(cppnetlib-message-directives ${CPP-NETLIB_MESSAGE_DIRECTIVES_SRCS})
19+
add_library(network-message-directives ${CPP-NETLIB_MESSAGE_DIRECTIVES_SRCS})
2020

2121
set(CPP-NETLIB_MESSAGE_WRAPPERS_SRCS
2222
wrappers.cpp)
2323

24-
add_library(cppnetlib-message-wrappers ${CPP-NETLIB_MESSAGE_WRAPPERS_SRCS})
24+
add_library(network-message-wrappers ${CPP-NETLIB_MESSAGE_WRAPPERS_SRCS})
2525

2626
# prepend current directory to make paths absolute
2727
prependToElements("${CMAKE_CURRENT_SOURCE_DIR}/"

‎message/test/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ if (CPP-NETLIB_BUILD_TESTS)
1212
if(CPP-NETLIB_BUILD_SINGLE_LIB)
1313
set(link_cppnetlib_lib cppnetlib)
1414
else()
15-
set(link_cppnetlib_libcppnetlib-message
16-
cppnetlib-message-directives
17-
cppnetlib-message-wrappers)
15+
set(link_cppnetlib_libnetwork-message
16+
network-message-directives
17+
network-message-wrappers)
1818
endif()
1919
foreach (test${TESTS})
2020
add_executable(cpp-netlib-${test}${test}.cpp)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp