mirror/openvpn3
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn3.git synced 2024-09-19 19:52:15 +02:00
Code

CMake: Reorder includes to prefer asio

Browse Source 
By adding the asio includes first we have a better
chance to force using "our" asio. This can be important
since some parts of the code require a patched version.

The actual "core" parts of the code work fine with
upstream asio however, so I also do not want to
force the patched asio by requiring a special header
name or directory structure.

So this is a compromise solution which hopefully works
for most use-cases.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
(cherry picked from commit bc7f4be01b)
This commit is contained in:
Frank Lichtenheld 2023-03-20 13:37:05 +01:00 committed by Yuriy Darnobyt
parent 38ef9f2786
commit c9939d271b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/findcoredeps.cmake
View File

@ -80,20 +80,24 @@ function(add_core_dependencies target)
endif ()
else ()
list(APPEND CMAKE_PREFIX_PATH
${DEP_DIR}/mbedtls/mbedtls-${PLAT}
${DEP_DIR}/lz4/lz4-${PLAT}
${DEP_DIR}/asio/asio
${DEP_DIR}/lz4/lz4-${PLAT}
${DEP_DIR}/mbedtls/mbedtls-${PLAT}
)
list(APPEND CMAKE_LIBRARY_PATH
${DEP_DIR}/mbedtls/mbedtls-${PLAT}/library
)
endif ()
find_package(lz4 REQUIRED)
# asio should go first since some of our code requires
# a patched version. So we want to prefer its include
# directories.
find_package(asio REQUIRED)
target_link_libraries(${target} lz4::lz4)
target_link_libraries(${target} asio::asio)
find_package(lz4 REQUIRED)
target_link_libraries(${target} lz4::lz4)
add_ssl_library(${target})
if (APPLE)