Update CMakeLists.txt for boost

This commit is contained in:
Vinnie Falco
2017-07-23 20:04:07 -07:00
parent ad8c5f9f7f
commit 198846d7bd
22 changed files with 21 additions and 133 deletions
-2
View File
@@ -39,8 +39,6 @@ if ((NOT "${VARIANT}" STREQUAL "coverage") AND
zlib.cpp
)
target_link_libraries(lib-tests Beast ${Boost_PROGRAM_OPTIONS_LIBRARY})
if (MINGW)
set_target_properties(lib-tests PROPERTIES COMPILE_FLAGS "-Wa,-mbig-obj")
endif()
-7
View File
@@ -9,7 +9,6 @@
GroupSources(extras/boost/beast extras)
GroupSources(include/boost/beast beast)
GroupSources(test/benchmarks "/")
GroupSources(test/http "/")
@@ -25,9 +24,3 @@ add_executable (benchmarks
parser.cpp
utf8_checker.cpp
)
target_link_libraries(benchmarks
Beast
${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
)
+3 -8
View File
@@ -24,13 +24,8 @@ add_executable (common-test
write_msg.cpp
main.cpp
)
target_link_libraries(common-test
Beast
${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
)
if (OPENSSL_FOUND)
target_link_libraries (common-test ${OPENSSL_LIBRARIES})
target_link_libraries (common-test
${OPENSSL_LIBRARIES}
)
endif()
-10
View File
@@ -10,7 +10,6 @@
GroupSources(example example)
GroupSources(extras/boost/beast extras)
GroupSources(include/boost/beast beast)
GroupSources(test/core "/")
add_executable (core-tests
@@ -55,12 +54,3 @@ add_executable (core-tests
sha1.cpp
detail/varint.cpp
)
target_link_libraries(core-tests
Beast
${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_COROUTINE_LIBRARY}
${Boost_THREAD_LIBRARY}
${Boost_CONTEXT_LIBRARY}
)
-10
View File
@@ -10,7 +10,6 @@
GroupSources(example example)
GroupSources(extras/boost/beast extras)
GroupSources(include/boost/beast beast)
GroupSources(test/http "/")
add_executable (http-tests
@@ -47,12 +46,3 @@ add_executable (http-tests
verb.cpp
write.cpp
)
target_link_libraries(http-tests
Beast
${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_COROUTINE_LIBRARY}
${Boost_THREAD_LIBRARY}
${Boost_CONTEXT_LIBRARY}
)
+3 -8
View File
@@ -11,7 +11,6 @@ GroupSources(example/server-framework framework)
GroupSources(example/common common)
GroupSources(extras/boost/beast extras)
GroupSources(include/boost/beast beast)
GroupSources(test/server "/")
add_executable (server-test
@@ -37,12 +36,8 @@ add_executable (server-test
wss_ports.cpp
)
target_link_libraries(server-test
Beast
${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
)
if (OPENSSL_FOUND)
target_link_libraries (server-test ${OPENSSL_LIBRARIES})
target_link_libraries (server-test
${OPENSSL_LIBRARIES}
)
endif()
+3 -12
View File
@@ -12,8 +12,6 @@ GroupSources(include/boost/beast beast)
GroupSources(test/websocket "/")
#include_directories(../../example/)
add_executable (websocket-tests
${BOOST_BEAST_INCLUDES}
${EXTRAS_INCLUDES}
@@ -32,15 +30,8 @@ add_executable (websocket-tests
utf8_checker.cpp
)
target_link_libraries(websocket-tests
Beast
${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_COROUTINE_LIBRARY}
${Boost_THREAD_LIBRARY}
${Boost_CONTEXT_LIBRARY}
)
if (OPENSSL_FOUND)
target_link_libraries(websocket-tests ${OPENSSL_LIBRARIES})
target_link_libraries(websocket-tests
${OPENSSL_LIBRARIES}
)
endif()
-4
View File
@@ -19,7 +19,3 @@ add_executable (wstest
Jamfile
main.cpp
)
target_link_libraries(wstest
Beast
)
-6
View File
@@ -50,9 +50,3 @@ add_executable (zlib-tests
error.cpp
inflate_stream.cpp
)
target_link_libraries(zlib-tests
Beast
${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
)