diff options
| author | eidheim <eidheim@gmail.com> | 2015-09-29 16:43:05 +0300 |
|---|---|---|
| committer | eidheim <eidheim@gmail.com> | 2015-09-29 16:43:05 +0300 |
| commit | c8e1db3a94eaf5168d969748ae7db9169dec8a6a (patch) | |
| tree | 9ae2108770c5cbef3f00f2d34001e7200f87f3df /CMakeLists.txt | |
| parent | 016fa526d2ef27bd2ce6d79c3720d0fddff97dff (diff) | |
Added MSYS2 support, and parse_test should now compile with g++-5.2.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e6a1693..58747f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,8 +16,6 @@ endif() #Only tested with versions 1.55 and 1.56 find_package(Boost 1.54.0 COMPONENTS system coroutine context REQUIRED) -message("Boost include dir: ${Boost_INCLUDE_DIR}") -message("Boost libraries: ${Boost_LIBRARIES}") include_directories(${Boost_INCLUDE_DIR}) if(APPLE) @@ -26,26 +24,26 @@ endif() #TODO: add requirement for version 1.0.1g (can it be done in one line?) find_package(OpenSSL REQUIRED) -message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}") -message("OpenSSL crypto libraries: ${OPENSSL_CRYPTO_LIBRARIES}") -message("OpenSSL SSL libraries: ${OPENSSL_SSL_LIBRARIES}") include_directories(${OPENSSL_INCLUDE_DIR}) find_package(Threads REQUIRED) -message("Threads libraries/flag: ${CMAKE_THREAD_LIBS_INIT}") include_directories(.) add_executable(wss_examples wss_examples.cpp) target_link_libraries(wss_examples ${Boost_LIBRARIES}) -target_link_libraries(wss_examples ${OPENSSL_CRYPTO_LIBRARIES}) -target_link_libraries(wss_examples ${OPENSSL_SSL_LIBRARIES}) +target_link_libraries(wss_examples ${OPENSSL_LIBRARIES}) target_link_libraries(wss_examples ${CMAKE_THREAD_LIBS_INIT}) add_executable(ws_examples ws_examples.cpp) target_link_libraries(ws_examples ${Boost_LIBRARIES}) -target_link_libraries(ws_examples ${OPENSSL_CRYPTO_LIBRARIES}) +target_link_libraries(ws_examples ${OPENSSL_CRYPTO_LIBRARY}) target_link_libraries(ws_examples ${CMAKE_THREAD_LIBS_INIT}) +if(MSYS) + target_link_libraries(ws_examples ws2_32 wsock32) + target_link_libraries(wss_examples ws2_32 wsock32) +endif() + enable_testing() add_subdirectory(test) |