Merge pull request cpp-netlib#372 from ruslo/libnames-refactor

deanberris · deanberris · commit d85820eafe44 · 2014-01-29T17:55:17.000-08:00
s,cppnetlib,network,
diff --git a/contrib/http_examples/CMakeLists.txt b/contrib/http_examples/CMakeLists.txt
@@ -16,7 +16,7 @@ endif (OPENSSL_FOUND)
 
 set( CPP-NETLIB_LOGGING_LIB "" )
 if( NOT CPP-NETLIB_DISABLE_LOGGING AND NOT CPP-NETLIB_BUILD_SINGLE_LIB)
-  set( CPP-NETLIB_LOGGING_LIB cppnetlib-logging )
+  set( CPP-NETLIB_LOGGING_LIB network-logging )
 endif()
 
 set(EXAMPLES
@@ -34,4 +34,4 @@ foreach(example ${EXAMPLES})
     ${CMAKE_THREAD_LIBS_INIT}
     )
   set_target_properties(${example} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
-endforeach(example)
+endforeach(example)
diff --git a/http/src/CMakeLists.txt b/http/src/CMakeLists.txt
@@ -24,24 +24,24 @@ set(CPP-NETLIB_HTTP_MESSAGE_SRCS
   http/response.cpp)
 
 if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
-  add_library(cppnetlib-http-message ${CPP-NETLIB_HTTP_MESSAGE_SRCS})
-  target_link_libraries(cppnetlib-http-message
+  add_library(network-http-message ${CPP-NETLIB_HTTP_MESSAGE_SRCS})
+  target_link_libraries(network-http-message
     ${Boost_LIBRARIES}
-    cppnetlib-message)
+    network-message)
 endif()
 
 set(CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS
     http/message/wrappers.cpp)
 
 if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
-  add_library(cppnetlib-http-message-wrappers ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS})
+  add_library(network-http-message-wrappers ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS})
 endif()
 
 set(CPP-NETLIB_CONSTANTS_SRCS
     constants.cpp)
 
 if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
-  add_library(cppnetlib-constants ${CPP-NETLIB_CONSTANTS_SRCS})
+  add_library(network-constants ${CPP-NETLIB_CONSTANTS_SRCS})
 endif()
 
 # Server implementation files.
@@ -51,7 +51,7 @@ set(CPP-NETLIB_HTTP_SERVER_SRCS
   http/server/dynamic_dispatcher.cpp)
 
 if (NOT CPP-NETLIB_BUILD_SINGLE_LIB)
-  add_library(cppnetlib-http-server ${CPP-NETLIB_HTTP_SERVER_SRCS})
+  add_library(network-http-server ${CPP-NETLIB_HTTP_SERVER_SRCS})
 endif()
 
 # HTTP client
diff --git a/http/test/CMakeLists.txt b/http/test/CMakeLists.txt
@@ -29,20 +29,20 @@ set( CPPNETLIB_LIBRARIES cppnetlib )
 set( CPPNETLIB_SERVER_LIBRARIES ${CPPNETLIB_LIBRARIES} )
 if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
     set( CPPNETLIB_LIBRARIES
-        cppnetlib-message
-        cppnetlib-message-wrappers
-        cppnetlib-http-message
-        cppnetlib-http-message-wrappers
+        network-message
+        network-message-wrappers
+        network-http-message
+        network-http-message-wrappers
         network-uri
-        cppnetlib-constants )
+        network-constants )
 
 #    set( CPPNETLIB_CLIENT_LIBRARIES
 #        ${CPPNETLIB_LIBRARIES}
-#        cppnetlib-http-client
-#        cppnetlib-http-client-connections )
+#        network-http-client
+#        network-http-client-connections )
 
     set( CPPNETLIB_SERVER_LIBRARIES
-         cppnetlib-http-server )
+         network-http-server )
 endif()
 
 
diff --git a/logging/CMakeLists.txt b/logging/CMakeLists.txt
@@ -13,7 +13,7 @@ if( NOT CPP-NETLIB_DISABLE_LOGGING )
 
   # this library name is defined only if we created the target
   # if not then it will be empty
-  set( CPP-NETLIB_LOGGING_LIB cppnetlib-logging )
+  set( CPP-NETLIB_LOGGING_LIB network-logging )
   add_definitions(-DNETWORK_ENABLE_LOGGING)
 
   if(CPP-NETLIB_BUILD_TESTS)
diff --git a/logging/src/CMakeLists.txt b/logging/src/CMakeLists.txt
@@ -8,7 +8,7 @@ include_directories(${CPP-NETLIB_SOURCE_DIR}/logging/src ${CPP-NETLIB_SOURCE_DIR
 set(CPP-NETLIB_LOGGING_SRCS
     logging.cpp)
 
-add_library(cppnetlib-logging ${CPP-NETLIB_LOGGING_SRCS})
+add_library(network-logging ${CPP-NETLIB_LOGGING_SRCS})
 
 # prepend current directory to make paths absolute
 prependToElements( "${CMAKE_CURRENT_SOURCE_DIR}/"
diff --git a/logging/test/CMakeLists.txt b/logging/test/CMakeLists.txt
@@ -18,7 +18,7 @@ if (CPP-NETLIB_BUILD_TESTS)
   if(CPP-NETLIB_BUILD_SINGLE_LIB)
     set(link_cppnetlib_lib cppnetlib)
   else()
-    set(link_cppnetlib_lib cppnetlib-logging)
+    set(link_cppnetlib_lib network-logging)
   endif()
   foreach (test ${TESTS})
     if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
diff --git a/message/src/CMakeLists.txt b/message/src/CMakeLists.txt
@@ -10,18 +10,18 @@ include_directories(${CPP-NETLIB_SOURCE_DIR}/uri/src ${CPP-NETLIB_SOURCE_DIR}/me
 set(CPP-NETLIB_MESSAGE_SRCS
     message.cpp)
 
-add_library(cppnetlib-message ${CPP-NETLIB_MESSAGE_SRCS})
-target_link_libraries(cppnetlib-message network-uri)
+add_library(network-message ${CPP-NETLIB_MESSAGE_SRCS})
+target_link_libraries(network-message network-uri)
 
 set(CPP-NETLIB_MESSAGE_DIRECTIVES_SRCS
     directives.cpp)
 
-add_library(cppnetlib-message-directives ${CPP-NETLIB_MESSAGE_DIRECTIVES_SRCS})
+add_library(network-message-directives ${CPP-NETLIB_MESSAGE_DIRECTIVES_SRCS})
 
 set(CPP-NETLIB_MESSAGE_WRAPPERS_SRCS
     wrappers.cpp)
 
-add_library(cppnetlib-message-wrappers ${CPP-NETLIB_MESSAGE_WRAPPERS_SRCS})
+add_library(network-message-wrappers ${CPP-NETLIB_MESSAGE_WRAPPERS_SRCS})
 
 # prepend current directory to make paths absolute
 prependToElements( "${CMAKE_CURRENT_SOURCE_DIR}/"
diff --git a/message/test/CMakeLists.txt b/message/test/CMakeLists.txt
@@ -12,9 +12,9 @@ if (CPP-NETLIB_BUILD_TESTS)
   if(CPP-NETLIB_BUILD_SINGLE_LIB)
     set(link_cppnetlib_lib cppnetlib)
   else()
-    set(link_cppnetlib_lib cppnetlib-message
-      cppnetlib-message-directives
-      cppnetlib-message-wrappers)
+    set(link_cppnetlib_lib network-message
+      network-message-directives
+      network-message-wrappers)
   endif()
   foreach (test ${TESTS})
     add_executable(cpp-netlib-${test} ${test}.cpp)
