Skip to content

Restructure dirs #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 9, 2013
Merged

Restructure dirs #184

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e7cd26
Moved the HTTP examples to contrib/http_examples; moved libs/network/…
glynos Jan 2, 2013
1ef781f
Added gtest as a submodule.
glynos Jan 5, 2013
8a48c83
Updated project to use the uri submodule; updated some code in order …
glynos Jan 5, 2013
195b5a6
Configured the project to build and link properly using MSVC 2012 on …
glynos Jan 8, 2013
c08ccd8
Updated README and removed incorrect and out-of-date information.
glynos Jan 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Next Next commit
Moved the HTTP examples to contrib/http_examples; moved libs/network/… 
…doc to doc.
  • Loading branch information
@glynos
glynos committed Jan 3, 2013
commit 0e7cd26247fd90c8cd9f4ade139606222e89c97a
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,7 @@ add_subdirectory(message)
add_subdirectory(logging)
add_subdirectory(concurrency)
add_subdirectory(http)
add_subdirectory(mime)
#add_subdirectory(mime)
if(CPP-NETLIB_BUILD_EXAMPLES)
add_subdirectory(contrib/http_examples)
endif()
74 changes: 40 additions & 34 deletions libs/network/example/CMakeLists.txt → contrib/http_examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,42 @@
# (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

include_directories(${CPP-NETLIB_SOURCE_DIR}/include)
include_directories(${CPP-NETLIB_SOURCE_DIR})
include_directories(
${CPP-NETLIB_SOURCE_DIR}/uri/src
${CPP-NETLIB_SOURCE_DIR}/message/src
${CPP-NETLIB_SOURCE_DIR}/logging/src
${CPP-NETLIB_SOURCE_DIR}/http/src
${CPP-NETLIB_SOURCE_DIR})
if (OPENSSL_FOUND)
include_directories(${OPENSSL_INCLUDE_DIR})
endif (OPENSSL_FOUND)

add_executable(uri_builder uri_builder.cpp)
if( NOT CPP-NETLIB_DISABLE_LOGGING )
set( CPP-NETLIB_LOGGING_LIB cppnetlib-logging )
endif()

add_executable(simple_wget simple_wget.cpp)
add_executable(atom_reader atom/atom.cpp atom/main.cpp)
add_executable(rss_reader rss/rss.cpp rss/main.cpp)
add_executable(twitter_search twitter/search.cpp)
add_executable(hello_world_server http/hello_world_server.cpp)
#add_executable(hello_world_server http/hello_world_server.cpp)
add_executable(hello_world_client http/hello_world_client.cpp)
#if (UNIX)
# add_executable(fileserver http/fileserver.cpp)
#endif (UNIX)
set(BOOST_CLIENT_LIBS
${Boost_DATE_TIME_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_REGEX_LIBRARY}
)
${Boost_DATE_TIME_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_REGEX_LIBRARY}
)
set(BOOST_SERVER_LIBS
${Boost_DATE_TIME_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
)

target_link_libraries(uri_builder
${BOOST_CLIENT_LIBS}
${CMAKE_THREAD_LIBS_INIT}
cppnetlib-uri)
${Boost_DATE_TIME_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
)

target_link_libraries(simple_wget
${BOOST_CLIENT_LIBS}
Expand All @@ -49,7 +51,8 @@ target_link_libraries(simple_wget
cppnetlib-http-message
cppnetlib-constants
cppnetlib-http-client
cppnetlib-http-client-connections)
cppnetlib-http-client-connections
${CPP-NETLIB_LOGGING_LIB})

target_link_libraries(atom_reader
${BOOST_CLIENT_LIBS}
Expand All @@ -62,7 +65,8 @@ target_link_libraries(atom_reader
cppnetlib-http-message-wrappers
cppnetlib-constants
cppnetlib-http-client
cppnetlib-http-client-connections)
cppnetlib-http-client-connections
${CPP-NETLIB_LOGGING_LIB})

target_link_libraries(rss_reader
${BOOST_CLIENT_LIBS}
Expand All @@ -74,7 +78,8 @@ target_link_libraries(rss_reader
cppnetlib-http-message
cppnetlib-constants
cppnetlib-http-client
cppnetlib-http-client-connections)
cppnetlib-http-client-connections
${CPP-NETLIB_LOGGING_LIB})

target_link_libraries(twitter_search
${BOOST_CLIENT_LIBS}
Expand All @@ -87,13 +92,15 @@ target_link_libraries(twitter_search
cppnetlib-http-message
cppnetlib-constants
cppnetlib-http-client
cppnetlib-http-client-connections)
cppnetlib-http-client-connections
${CPP-NETLIB_LOGGING_LIB})

target_link_libraries(hello_world_server
${BOOST_SERVER_LIBS}
${CMAKE_THREAD_LIBS_INIT}
cppnetlib-http-server-parsers
cppnetlib-http-server)
#target_link_libraries(hello_world_server
# ${BOOST_SERVER_LIBS}
# ${CMAKE_THREAD_LIBS_INIT}
# cppnetlib-http-server-parsers
# cppnetlib-http-server
# ${CPP-NETLIB_LOGGING_LIB})

target_link_libraries(hello_world_client
${BOOST_CLIENT_LIBS}
Expand All @@ -106,15 +113,15 @@ target_link_libraries(hello_world_client
cppnetlib-http-message
cppnetlib-constants
cppnetlib-http-client
cppnetlib-http-client-connections)
cppnetlib-http-client-connections
${CPP-NETLIB_LOGGING_LIB})

if (OPENSSL_FOUND)
target_link_libraries(uri_builder ${OPENSSL_LIBRARIES})
target_link_libraries(simple_wget ${OPENSSL_LIBRARIES})
target_link_libraries(atom_reader ${OPENSSL_LIBRARIES})
target_link_libraries(rss_reader ${OPENSSL_LIBRARIES})
target_link_libraries(twitter_search ${OPENSSL_LIBRARIES})
target_link_libraries(hello_world_server ${OPENSSL_LIBRARIES})
#target_link_libraries(hello_world_server ${OPENSSL_LIBRARIES})
target_link_libraries(hello_world_client ${OPENSSL_LIBRARIES})
endif (OPENSSL_FOUND)

Expand All @@ -126,12 +133,11 @@ endif (OPENSSL_FOUND)
# cppnetlib-server-parsers)
#endif (UNIX)

set_target_properties(uri_builder PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
set_target_properties(simple_wget PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
set_target_properties(atom_reader PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
set_target_properties(rss_reader PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
set_target_properties(twitter_search PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
set_target_properties(hello_world_server PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
#set_target_properties(hello_world_server PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
set_target_properties(hello_world_client PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
#if (UNIX)
# set_target_properties(fileserver PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
Expand Down
0 libs/network/example/Jamfile.v2 → contrib/http_examples/Jamfile.v2
View file
Open in desktop
File renamed without changes.
0 libs/network/example/atom/atom.cpp → contrib/http_examples/atom/atom.cpp
View file
Open in desktop
File renamed without changes.
0 libs/network/example/atom/atom.hpp → contrib/http_examples/atom/atom.hpp
View file
Open in desktop
File renamed without changes.
0 libs/network/example/atom/main.cpp → contrib/http_examples/atom/main.cpp
View file
Open in desktop
File renamed without changes.
0 libs/network/example/http/fileserver.cpp → contrib/http_examples/http/fileserver.cpp
View file
Open in desktop
File renamed without changes.
0 ...twork/example/http/hello_world_client.cpp → ...http_examples/http/hello_world_client.cpp
View file
Open in desktop
File renamed without changes.
0 ...twork/example/http/hello_world_server.cpp → ...http_examples/http/hello_world_server.cpp
View file
Open in desktop
File renamed without changes.
0 libs/network/example/http/one_liner.cpp → contrib/http_examples/http/one_liner.cpp
View file
Open in desktop
File renamed without changes.
0 libs/network/example/rapidxml/license.txt → contrib/http_examples/rapidxml/license.txt
View file
Open in desktop
File renamed without changes.
0 libs/network/example/rapidxml/manual.html → contrib/http_examples/rapidxml/manual.html
View file
Open in desktop
File renamed without changes.
0 libs/network/example/rapidxml/rapidxml.hpp → contrib/http_examples/rapidxml/rapidxml.hpp
View file
Open in desktop
File renamed without changes.
0 ...k/example/rapidxml/rapidxml_iterators.hpp → ..._examples/rapidxml/rapidxml_iterators.hpp
View file
Open in desktop
File renamed without changes.
0 ...twork/example/rapidxml/rapidxml_print.hpp → ...http_examples/rapidxml/rapidxml_print.hpp
View file
Open in desktop
File renamed without changes.
0 ...twork/example/rapidxml/rapidxml_utils.hpp → ...http_examples/rapidxml/rapidxml_utils.hpp
View file
Open in desktop
File renamed without changes.
0 libs/network/example/rss/main.cpp → contrib/http_examples/rss/main.cpp
View file
Open in desktop
File renamed without changes.
0 libs/network/example/rss/rss.cpp → contrib/http_examples/rss/rss.cpp
View file
Open in desktop
File renamed without changes.
0 libs/network/example/rss/rss.hpp → contrib/http_examples/rss/rss.hpp
View file
Open in desktop
File renamed without changes.
0 libs/network/example/simple_wget.cpp → contrib/http_examples/simple_wget.cpp
View file
Open in desktop
File renamed without changes.
Loading