Skip to content

In MinGW, asio needs bcrypt #217

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 2 commits into from
May 25, 2024
+17 −10
Merged

In MinGW, asio needs bcrypt #217

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33aa95a
In MinGW, asio needs bcrypt
cboulay May 25, 2024
6652d2c
MINGW - Skip loguruthreadnames internal test because it always fails.
cboulay May 25, 2024
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
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -203,6 +203,9 @@ target_compile_definitions(lslobj PRIVATE
LOGURU_DEBUG_LOGGING=$<BOOL:${LSL_DEBUGLOG}>
PUBLIC ASIO_NO_DEPRECATED
)
if(MINGW)
target_link_libraries(lslobj PRIVATE bcrypt)
endif()

# platform specific configuration
if(UNIX AND NOT APPLE)
24 changes: 14 additions & 10 deletions testing/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -58,17 +58,21 @@ add_executable(lsl_test_exported
target_link_libraries(lsl_test_exported PRIVATE lsl common catch_main)


add_executable(lsl_test_internal
int/inireader.cpp
int/loguruthreadnames.cpp
int/network.cpp
int/stringfuncs.cpp
int/streaminfo.cpp
int/samples.cpp
int/postproc.cpp
int/serialization_v100.cpp
int/tcpserver.cpp
set(LSL_TEST_INTERNAL_SRCS
int/inireader.cpp
int/network.cpp
int/stringfuncs.cpp
int/streaminfo.cpp
int/samples.cpp
int/postproc.cpp
int/serialization_v100.cpp
int/tcpserver.cpp
)
if(NOT MINGW)
LIST(APPEND LSL_INTERNAL_SRCS int/loguruthreadnames.cpp)
endif()
message(STATUS ${LSL_TEST_INTERNAL_SRCS})
add_executable(lsl_test_internal ${LSL_TEST_INTERNAL_SRCS})
target_link_libraries(lsl_test_internal PRIVATE lslobj lslboost common catch_main)