Skip to content

Restructure dirs #179

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 7 commits into from
Dec 27, 2012
Merged

Restructure dirs #179

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e7bfb97
Moved around some directories and updated build scripts.
glynos Dec 26, 2012
4d424b8
Updated build scripts for the restructured uri so that it compiles on…
glynos Dec 26, 2012
fd5e7d5
Restructured the message framework, passing tests on Linux/GCC 4.7.
glynos Dec 26, 2012
9c4f0a5
Restructured logging code into a new subdirectory.
glynos Dec 26, 2012
eacf307
Updated build script references.
glynos Dec 26, 2012
dcbb386
Removed obsolete files; updated build scripts so that the include pat…
glynos Dec 26, 2012
33176c3
Adjustments to build scripts in order to compile on MSVC 2012.
glynos Dec 26, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Adjustments to build scripts in order to compile on MSVC 2012.
  • Loading branch information
@glynos
glynos committed Dec 26, 2012
commit 33176c35b909a878d46fac75698a3b402ca13ec9
9 changes: 9 additions & 0 deletions libs/network/test/http/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ if (OPENSSL_FOUND)
add_definitions(-DBOOST_NETWORK_ENABLE_HTTPS)
endif()

if( NOT CPP-NETLIB_DISABLE_LOGGING )
set( CPP-NETLIB_LOGGING_LIB cppnetlib-logging )
endif()

# 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 )

if (Boost_FOUND)
# These are the internal (simple) tests.
set ( MESSAGE_TESTS
Expand Down Expand Up @@ -77,6 +85,7 @@ if (Boost_FOUND)
cppnetlib-message
cppnetlib-message-wrappers
cppnetlib-message-directives
${CPP-NETLIB_LOGGING_LIB}
cppnetlib-http-message
cppnetlib-http-message-wrappers
cppnetlib-http-client
Expand Down
2 changes: 1 addition & 1 deletion uri/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if (Boost_FOUND)
add_executable(cpp-netlib-${test} ${test}.cpp)
add_dependencies(cpp-netlib-${test} cppnetlib-uri)
target_link_libraries(cpp-netlib-${test}
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri)
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri)
if (OPENSSL_FOUND)
target_link_libraries(cpp-netlib-${test} ${OPENSSL_LIBRARIES})
endif()
Expand Down