Skip to content

Commit c259e3a

Browse files
committed
Squashed 'lib/websocketpp/' changes from 378437a..c6d7e29
c6d7e29 Set version flags for release c432425 Update changelog 12b8f37 Merge branch 'pr/732' into develop 6b8dfe0 Merge branch 'pr/731' into develop e99aef0 cmake: Install websocketpp includes in the right cmake way, leaving out the examples and other stuff 5c48a11 Fix testsuite errors, due to a "Connection: upgrade" seen differently than "Connection: Upgrade" c2fd89b Update version flags for future development c612a35 Set version flags for 0.8.0 release 99d169f Update changelog for recent PRs 241741b Merge pull request #727 from bauerj/patch-1 702b6a9 Make HTTP Connection header capitalized 19cad99 credits c405097 tcp_pre_bind_handler returns a lib::error_code not an asio::error_code. These are sometimes the same but not always. Fix ensures that the error code types always match correctly no matter what they are. Update test suite to reflect adjusted behavior 7e8c8a8 Fix preprocessor syntax issue 88de392 Merge pull request #652 from vadz/preserve-asio-errors e79e0d1 Merge branch 'develop' of https://github.com/zaphoyd/websocketpp into develop bc12b81 Merge branch 'pr/608' into develop 8bc11bd credits 1cb045d Add pointers in the docs to new mingw support 2a36e41 Remove auto selection of mingw-std-threads when MinGW is detected. Increase the priority of mingw-std-threads given its optional status. 0e1fc63 remove submodule 0b0871d remove submodules 20c6791 Merge pull request #658 from gjasny/drop-unused-members e943c9e credits for patch 749b119 Merge pull request #665 from gegles/develop e9c6546 Fix compile issues for ASIO_STANDALONE b34a178 Drop unused class members e50ed8c update changelog for PR 67224f7 Merge pull request #636 from gjasny/remove-undefined-behaviour 0b2e14e Merge branch 'pr/589' into develop 1cb9666 Update changelog for PR cb3d7de Remove deprecated features to allow compiling with C++17 compilers fixes #592 9baab8f Normalize line endings to unix format fixes #644 6330286 Use separate buffers for compression and decompression to prevent corruption when reading and writing from separate threads. references #633 references #615 cb4cf66 Merge branch 'pr/634' into develop 99e1a99 change log update for PR 96b2d42 Merge branch 'pr/638' into develop bc04ae4 update changelog for PR ee74047 Merge pull request #645 from alex-che/integration_tests_sleep 2819d36 Merge branch 'develop' into integration_tests_sleep d282738 Merge branch 'pr/643' into develop a32eb08 change log entry for PR 6645fcb Merge pull request #646 from alex-che/timers_tests_sleep 29bb4ad Merge branch 'pr/647' into develop ac9164c update changelog for PR 4cab5e5 minor adjustments to recent extension negotiation related fixes, refactor a bit more extension negotiation code to be simpler 16d126e Remove custom handling of SSL_R_SHORT_READ errors. fixes #599 9ddb300 Update permessage-deflate support to reflect that zlib doesn't support a 256 bit window. Improve extension negotiation error checking and documentation. fixes #596 fixes #653 81ef065 Preserve ASIO errors if possible in asio::endpoint too e6e14df Make asio::connection::xxx_socket::translate_ec() methods static 527f401 Fix unitialized shared_ptr in mock_endpoint 0045664 Fix the tls_handshake_timeout unit test failing due to server thread not having enough time to start 7be3756 Fix refused client connection due to servers not yet started 5675036 Fix unit test timers clashing between tests 4b6cfed "stdint header included to fix uintXX_t compilation error" 6578aae Avoid undefined behaviour at circular shift 229134a Add pre bind handler for listen socket c7bef86 Fixed Capatialisation issue with submodule 3ad5029 Added MinGW threading Capability 7451e0c Merge pull request socketio#1 from ronneke1996/implement_close_code_1014 facb698 Fixed typo in error message 37ce8ab Merge branch 'pr/593' into develop abf927b Fix some bugs, normalize code style, update documentation, add tests e1f7575 Expose HTTP request headers f94b3c0 Implemented close code 1014 322e3ba Update telemetry_client to use Sleep on windows references #574 9019af0 Add FAQ entry e65b277 Remove catching websocketpp::lib::error_code in examples, fixes #584 8434139 Add first draft of print_client and print_client_tls d4a4b79 update changelog for recent PR 6b09310 Merge pull request #553 from yeswalrus/fix-tls-crash 2b310fa Merge branch 'develop' of https://github.com/zaphoyd/websocketpp into develop 0bb33e4 Change default listen backlog to socket_base::max_connections from 0, fixes #549 ebd0afd Check the return of get_connection, raise an appropriate error if it failed. 5f42305 remove trailing whitespaces a2f1827 Merge pull request #550 from wal-rus/fix-cmake 59fb9ec Added interface target to config file for cmake versions > 3.0 73c3b81 Added include directories to targets (How was this ever working?) cc851aa remove whitespace at end of lines in CMakeHelpers.cmake 0f2df92 Use CMakePackageConfigHelpers, make websocketpp-config.cmake.in relocatable 6b702cc Updated minimum required version to 2.8.8, Added VERSION argument to project if supported. 92c1f0c Fix default CMAKE_INSTALL_PREFIX setting on windows 9e51633 Add logging reference documentation 8f0fab3 Update docs & FAQ 94fe989 Store loggers in shared pointers references #501 #537 9da5ac9 Merge pull request #539 from jupp0r/feature/shutdown-fix-for-shared-ioservice 891a7a5 documentation 1013aa8 Fix shutdown bugs by holding loggers in shared_ptrs 366679b Update docs and changelog 94cc1ec Fix an issue detecting which version of the chrono library to use references #512 6f128a5 Move socket_init_handler from pre_init to init_asio #530 f5d14f3 Bump develop branch version 918745a Add test case for un-setting a handler (with NULL) git-subtree-dir: lib/websocketpp git-subtree-split: c6d7e295bf5a0ab9b5f896720cc1a0e0fdc397a7
1 parent 71c5745 commit c259e3a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+2115
-872
lines changed

CMakeLists.txt

Lines changed: 40 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,42 @@
11

22
############ Setup project and cmake
3-
4-
# Project name
5-
project (websocketpp)
6-
73
# Minimum cmake requirement. We should require a quite recent
84
# cmake for the dependency find macros etc. to be up to date.
9-
cmake_minimum_required (VERSION 2.6)
5+
cmake_minimum_required (VERSION 2.8.8)
106

7+
############ Paths
8+
9+
set (WEBSOCKETPP_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
10+
set (WEBSOCKETPP_INCLUDE ${WEBSOCKETPP_ROOT}/websocketpp)
11+
set (WEBSOCKETPP_BUILD_ROOT ${CMAKE_CURRENT_BINARY_DIR})
12+
set (WEBSOCKETPP_BIN ${WEBSOCKETPP_BUILD_ROOT}/bin)
13+
set (WEBSOCKETPP_LIB ${WEBSOCKETPP_BUILD_ROOT}/lib)
14+
15+
# CMake install step prefix. I assume linux users want the prefix to
16+
# be the default /usr or /usr/local so this is only adjusted on Windows.
17+
# This must be set prior to any call to project or it will not be read correctly.
18+
# - Windows: Build the INSTALL project in your solution file.
19+
# - Linux/OSX: make install.
20+
if (WIN32)
21+
set (CMAKE_INSTALL_PREFIX "${WEBSOCKETPP_ROOT}/install" CACHE PATH "")
22+
endif ()
23+
24+
############ Project name and version
1125
set (WEBSOCKETPP_MAJOR_VERSION 0)
12-
set (WEBSOCKETPP_MINOR_VERSION 7)
26+
set (WEBSOCKETPP_MINOR_VERSION 8)
1327
set (WEBSOCKETPP_PATCH_VERSION 0)
1428
set (WEBSOCKETPP_VERSION ${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSION}.${WEBSOCKETPP_PATCH_VERSION})
1529

30+
if(POLICY CMP0048)
31+
cmake_policy(GET CMP0048 _version_policy)
32+
endif()
33+
34+
if(_version_allowed STREQUAL NEW)
35+
project (websocketpp VERSION ${WEBSOCKETPP_VERSION})
36+
else()
37+
project (websocketpp)
38+
endif()
39+
1640
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
1741

1842
set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files")
@@ -44,21 +68,6 @@ set (CMAKE_CONFIGURATION_TYPES "Release;RelWithDebInfo;Debug" CACHE STRING "Conf
4468
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
4569
include (CMakeHelpers)
4670

47-
############ Paths
48-
49-
set (WEBSOCKETPP_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
50-
set (WEBSOCKETPP_INCLUDE ${WEBSOCKETPP_ROOT}/websocketpp)
51-
set (WEBSOCKETPP_BUILD_ROOT ${CMAKE_CURRENT_BINARY_DIR})
52-
set (WEBSOCKETPP_BIN ${WEBSOCKETPP_BUILD_ROOT}/bin)
53-
set (WEBSOCKETPP_LIB ${WEBSOCKETPP_BUILD_ROOT}/lib)
54-
55-
# CMake install step prefix. I assume linux users want the prefix to
56-
# be the default /usr or /usr/local so this is only adjusted on Windows.
57-
# - Windows: Build the INSTALL project in your solution file.
58-
# - Linux/OSX: make install.
59-
if (MSVC)
60-
set (CMAKE_INSTALL_PREFIX "${WEBSOCKETPP_ROOT}/install")
61-
endif ()
6271

6372
############ Build customization
6473

@@ -250,8 +259,16 @@ print_used_build_config()
250259

251260
export (PACKAGE websocketpp)
252261

253-
configure_file (websocketpp-config.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-config.cmake" @ONLY)
254-
configure_file (websocketpp-configVersion.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-configVersion.cmake" @ONLY)
262+
include(CMakePackageConfigHelpers)
263+
configure_package_config_file(websocketpp-config.cmake.in
264+
"${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-config.cmake"
265+
PATH_VARS INSTALL_INCLUDE_DIR
266+
INSTALL_DESTINATION "${INSTALL_CMAKE_DIR}"
267+
NO_CHECK_REQUIRED_COMPONENTS_MACRO
268+
)
269+
write_basic_package_version_file("${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-configVersion.cmake"
270+
VERSION ${WEBSOCKETPP_VERSION}
271+
COMPATIBILITY ExactVersion)
255272

256273
# Install the websocketpp-config.cmake and websocketpp-configVersion.cmake
257274
install (FILES

Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = WebSocket++
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 0.7.0
41+
PROJECT_NUMBER = 0.8.1
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

SConstruct

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,14 @@ echo_server = SConscript('#/examples/echo_server/SConscript',variant_dir = build
234234
# echo_client
235235
echo_client = SConscript('#/examples/echo_client/SConscript',variant_dir = builddir + 'echo_client',duplicate = 0)
236236

237+
# print_client
238+
print_client = SConscript('#/examples/print_client/SConscript',variant_dir = builddir + 'print_client',duplicate = 0)
239+
237240
# echo_server_tls
238241
if tls_build:
239242
echo_server_tls = SConscript('#/examples/echo_server_tls/SConscript',variant_dir = builddir + 'echo_server_tls',duplicate = 0)
240243
echo_server_both = SConscript('#/examples/echo_server_both/SConscript',variant_dir = builddir + 'echo_server_both',duplicate = 0)
244+
print_client_tls = SConscript('#/examples/print_client_tls/SConscript',variant_dir = builddir + 'print_client_tls',duplicate = 0)
241245

242246
# broadcast_server
243247
broadcast_server = SConscript('#/examples/broadcast_server/SConscript',variant_dir = builddir + 'broadcast_server',duplicate = 0)

changelog.md

Lines changed: 95 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,91 @@
11
HEAD
22

3+
0.8.1 - 2018-07-16
4+
Note: This release does not change library behavior. It only corrects issues
5+
in the installer and test system.
6+
- Test Suite: Adjust test suite to match behavior introduced in 0.8.0. Thank
7+
you Gianfranco Costamagna for reporting and a patch. #731
8+
- CMake: Update cmake installer to only install library files globally.
9+
Thank you Gianfraco Costamanga for reporting and a patch. #732
10+
11+
0.8.0 - 2018-07-12
12+
- Examples: Add `print_client` example. This demonstrates a minimal non-TLS
13+
client that connects to a server and prints out the messages it receives.
14+
- Examples: Add `print_client_tls` example. This demonstrates a minimal TLS
15+
client, including basic support via Asio+OpenSSL for certificate chain
16+
and hostname verification.
17+
- Feature: Add getter for all headers to the HTTP parsers. This allows a
18+
wrapping library to enumerate all headers to send upstream. Thank you Jupp
19+
Müller for reporting and an initial pull request.
20+
- Improvement: Move the `socket_init_handler` to execute as a part of `init_asio`
21+
rather than connection `pre_init`. This allows setting of socket options prior
22+
to the bind/listen/accept system calls. Thank you ChristianRobl3D for
23+
reporting #530.
24+
- Improvement: Timers in transport integration tests should only fail if their
25+
own test times out, rather than any test. #643 Thank you Alex Korotkin for
26+
reporting and a patch.
27+
- Improvement: Preserve transport layer error codes in more cases, particularly
28+
during calls to `endpoint::listen`. #652 Thank you vadz for reporting and
29+
patches.
30+
- Compatibility: Make sure the chrono library used by Boost/Asio is in sync
31+
with what the websocketpp is using. Thank you Flow86 for reporting and a
32+
patch.
33+
- Compatibility: Update `telemetry_client` to use a slightly more cross platform
34+
method of sleeping. Should work on windows now. Thank you Meir Yanovich for
35+
reporting.
36+
- Compatibility: Updated permessage-deflate support to reflect that the zlib
37+
library does not actually support a sliding window size of 256 bits.
38+
WebSocket++ will no longer negotiate 256 bit deflate windows. If the user
39+
of the library tries to request a 256 bit window a 512 bit window will be
40+
specified instead (This was the previous behavior). #596 #653 Thank you
41+
Vinnie Falco and Gianfranco Costamagna for reporting.
42+
- Compatibility: Better error handling and logging in cases where extension
43+
requests parse correctly but negotiation fails.
44+
- Compatibility: Removed custom handling of `SSL_R_SHORT_READ` error condition.
45+
This error code no longer exists in modern versions of OpenSSL and causes
46+
a build error. It wasn't being used for anything particularly important
47+
(slightly improving error reporting) and there isn't a great replacement.
48+
#599 Thank you Gianfranco Costamagna for reporting.
49+
- Compatibility: Add missing `<stdint>` headers. Fixes issues with g++ 5.4.0.
50+
#638 Thank you Alex Korotkin for reporting and a patch.
51+
- Compatibility: Remove the use of `std::auto_ptr` and `std::binary_function`
52+
from builds with C++11 or later. These features are deprecated and were
53+
removed entirely in C++17. This change allows building WebSocket++ on
54+
C++17 compilers. #592 Thank you Michal Fojtak for reporting and a patch
55+
- Compatibility: Add 1014 close code and adds missing descriptions for codes
56+
1012 and 1013. #589 Thank you jbwdevries and ronneke1996 for reporting and
57+
patches.
58+
- Compatibility: Add hooks to support `mingw-std-threads` C++11 thread and mutex
59+
polyfill library as an alternative to Boost. #608 Thank you Peter Taylor for
60+
reporting and an initial patch.
61+
- Compatibility: Changed the handshake connection token to 'Upgrade' from
62+
'upgrade'. Technically this header is supposed to be processed case
63+
insensitively. In practice, there are browsers (such as Edge) that don't do
64+
this and they tend to use the uppercase value used as an example in RFC6455.
65+
Thank you Johann Bauer for reporting and a patch. #727
66+
- Bug: Store loggers in shared pointers to avoid crashes related to connections
67+
trying to write logs entries after their respective endpoint has been
68+
deallocated. Thank you Thalhammer for reporting and Jupp Müller for the
69+
patch. #539 #501
70+
- Bug: Change default listen backlog from 0 to `socket_base::max_connections`.
71+
#549. Thank you derwassi and zwelab for reporting and na1pir for providing
72+
access to hardware to debug the issue.
73+
- Bug: Fix a crash in the accept loop when `get_connection` fails. #551 Thank you
74+
Walter Gray for a patch.
75+
- Bug/Documentation: Fix incorrect example code that used
76+
`websocketpp::lib::error_code` instead of `websocketpp::exception`. Thank you
77+
heretic13 for reporting
78+
- Bug: Fix uninitialized shared pointer in Asio transport test suite. #647
79+
Thank you Alex Korotkin for reporting and a patch.
80+
- Bug: Fix a thread safety issue in the permessage-deflate extension that
81+
caused message corruption when sending compressed messages from a different
82+
thread than the main I/O thread. #615 Thank you KyleNyenhuis and Pieter De
83+
Gendt for reporting and a patch.
84+
- Bug: Fix an undefined behavior issue performing a 64 bit wide shift on a 64
85+
bit value. #636 Thank you Gregor Jasny for reporting and a patch
86+
- Bug: Fix some compile issues with ASIO_STANDALONE. #662 #665 Thank you
87+
chronoxor and Guillaume Egles for reporting and patches.
88+
389
0.7.0 - 2016-02-22
490
- MINOR BREAKING SOCKET POLICY CHANGE: Asio transport socket policy method
591
`cancel_socket` will now return `lib::asio::error_code` instead of `void`.
@@ -12,6 +98,10 @@ HEAD
1298
Muzahid Hussain for reporting and related code. #458
1399
- Feature: Add support for subprotocols in Hybi00. Thank you Lukas Obermann
14100
for reporting and a patch. #518
101+
- Feature: Adds `tcp_pre_bind handler` to Asio transport. This allows setting
102+
arbitrary socket options after the listen acceptor has been created but before
103+
the socket bind has been performed. #634 #439 Thank you Gregor Jasny for
104+
the patch.
15105
- Improvement: Better automatic std::chrono feature detection for Visual Studio
16106
- Improvement: Major refactoring to bundled CMake build system. CMake can now be
17107
used to build all of the examples and the test suite. Thank you Thijs Wenker
@@ -31,9 +121,9 @@ HEAD
31121
and `string::empty()`. This avoids generating unnecessary temporary objects.
32122
#468 Thank you Vladislav Yaroslavlev for reporting and a patch.
33123
- Documentation: Adds an example demonstrating the use of external `io_service`
34-
- Documentation: Adds a simple echo_client example.
124+
- Documentation: Adds a simple `echo_client` example.
35125
- Documentation: Begins migration of the web based user manual into Doxygen.
36-
- Bug: Fix memory leak when init_asio produces an error. #454 Thank you Mark
126+
- Bug: Fix memory leak when `init_asio` produces an error. #454 Thank you Mark
37127
Grimes for reporting and fixing.
38128
- Bug: Fix crash when processing a specially crafted HTTP header. Thank you Eli
39129
Fidler for reporting, test cases, and a patch. #456
@@ -51,7 +141,7 @@ HEAD
51141
- Bug: Fix an issue where TLS includes were broken for Asio Standalone builds.
52142
Thank you giachi and Bastien Brunnenstein for reporting. #491
53143
- Bug: Remove the use of cached read and write handlers in the Asio transport.
54-
This feature caused memory leaks when the io_service the connection was
144+
This feature caused memory leaks when the `io_service` the connection was
55145
running on was abruptly stopped. There isn't a clean and safe way of using
56146
this optimization without global state and the associated locks. The locks
57147
perform worse. Thank you Xavier Gibert for reporting, test cases, and code.
@@ -60,8 +150,8 @@ HEAD
60150
Xavier Gibert for reporting and a patch #524
61151
- Compatibility: Fixes a number of build & config issues on Visual Studio 2015
62152
- Compatibility: Removes non-standards compliant masking behavior. #395, #469
63-
- Compatibility: Replace deprecated use of auto_ptr on systems where unique_ptr
64-
is available.
153+
- Compatibility: Replace deprecated use of `auto_ptr` on systems where
154+
`unique_ptr` is available.
65155

66156
0.6.0 - 2015-06-02
67157
- MINOR BREAKING TRANSPORT POLICY CHANGE: Custom transport policies will now be

cmake/CMakeHelpers.cmake

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ macro (print_used_build_config)
1414
message (STATUS "WEBSOCKETPP_BOOST_LIBS = ${WEBSOCKETPP_BOOST_LIBS}")
1515
message (STATUS "WEBSOCKETPP_PLATFORM_LIBS = ${WEBSOCKETPP_PLATFORM_LIBS}")
1616
message (STATUS "WEBSOCKETPP_PLATFORM_TLS_LIBS = ${WEBSOCKETPP_PLATFORM_TLS_LIBS}")
17-
message ("")
17+
message ("")
1818
message (STATUS "OPENSSL_FOUND = ${OPENSSL_FOUND}")
1919
message (STATUS "OPENSSL_INCLUDE_DIR = ${OPENSSL_INCLUDE_DIR}")
2020
message (STATUS "OPENSSL_LIBRARIES = ${OPENSSL_LIBRARIES}")
2121
message (STATUS "OPENSSL_VERSION = ${OPENSSL_VERSION}")
22-
message ("")
22+
message ("")
2323
endmacro ()
2424

25-
# Adds the given folder_name into the source files of the current project.
25+
# Adds the given folder_name into the source files of the current project.
2626
# Use this macro when your module contains .cpp and .h files in several subdirectories.
2727
# Your sources variable needs to be WSPP_SOURCE_FILES and headers variable WSPP_HEADER_FILES.
2828
macro(add_source_folder folder_name)
@@ -39,7 +39,7 @@ macro (init_target NAME)
3939
set (TARGET_NAME ${NAME})
4040
message ("** " ${TARGET_NAME})
4141

42-
# Include our own module path. This makes #include "x.h"
42+
# Include our own module path. This makes #include "x.h"
4343
# work in project subfolders to include the main directory headers.
4444
include_directories (${CMAKE_CURRENT_SOURCE_DIR})
4545
endmacro ()
@@ -74,29 +74,29 @@ endmacro ()
7474
# Finalize target for all types
7575
macro (final_target)
7676
if ("${TARGET_LIB_TYPE}" STREQUAL "EXECUTABLE")
77-
install (TARGETS ${TARGET_NAME}
78-
RUNTIME DESTINATION "bin"
77+
install (TARGETS ${TARGET_NAME}
78+
RUNTIME DESTINATION "bin"
7979
CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES})
8080
endif ()
8181

82-
# install headers, directly from current source dir and look for subfolders with headers
83-
file (GLOB_RECURSE TARGET_INSTALL_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.hpp)
84-
foreach (hppfile ${TARGET_INSTALL_HEADERS})
85-
get_filename_component (currdir ${hppfile} PATH)
86-
install (FILES ${hppfile} DESTINATION "include/${TARGET_NAME}/${currdir}")
87-
endforeach()
82+
install (DIRECTORY ${CMAKE_SOURCE_DIR}/${TARGET_NAME}
83+
DESTINATION include/
84+
FILES_MATCHING PATTERN "*.hpp*")
8885
endmacro ()
8986

9087
macro (link_boost)
9188
target_link_libraries (${TARGET_NAME} ${Boost_LIBRARIES})
89+
set_property(TARGET ${TARGET_NAME} APPEND PROPERTY INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR})
9290
endmacro ()
9391

9492
macro (link_openssl)
9593
target_link_libraries (${TARGET_NAME} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
94+
set_property(TARGET ${TARGET_NAME} APPEND PROPERTY INCLUDE_DIRECTORIES ${OPENSSL_INCLUDE_DIR})
9695
endmacro ()
9796

9897
macro (link_zlib)
9998
target_link_libraries (${TARGET_NAME} ${ZLIB_LIBRARIES})
99+
set_property(TARGET ${TARGET_NAME} APPEND PROPERTY INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIR})
100100
endmacro ()
101101

102102
macro (include_subdirs PARENT)

0 commit comments

Comments
 (0)