Skip to content

Commit 20cc197

Browse files
author
Peter Thorson
committed
Fix a few other misc test related things
1 parent 89df55c commit 20cc197

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,5 @@ examples/wsperf/wsperf_client
9090
install
9191
Makefile
9292
bin
93+
94+
Testing/Temporary/CTestCostData.txt

CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,10 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
192192
set (Boost_USE_STATIC_LIBS TRUE)
193193
endif ()
194194

195+
if (NOT Boost_USE_STATIC_LIBS)
196+
add_definitions (/DBOOST_TEST_DYN_LINK)
197+
endif ()
198+
195199
set (Boost_FIND_REQUIRED TRUE)
196200
set (Boost_FIND_QUIETLY TRUE)
197201
set (Boost_DEBUG FALSE)

cmake/CMakeHelpers.cmake

+7
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ macro (print_used_build_config)
1515
message (STATUS "WEBSOCKETPP_PLATFORM_LIBS = ${WEBSOCKETPP_PLATFORM_LIBS}")
1616
message (STATUS "WEBSOCKETPP_PLATFORM_TLS_LIBS = ${WEBSOCKETPP_PLATFORM_TLS_LIBS}")
1717
message ("")
18+
message (STATUS "OPENSSL_FOUND = ${OPENSSL_FOUND}")
19+
message (STATUS "OPENSSL_INCLUDE_DIR = ${OPENSSL_INCLUDE_DIR}")
20+
message (STATUS "OPENSSL_LIBRARIES = ${OPENSSL_LIBRARIES}")
21+
message (STATUS "OPENSSL_VERSION = ${OPENSSL_VERSION}")
22+
message ("")
1823
endmacro ()
1924

2025
# Adds the given folder_name into the source files of the current project.
@@ -49,6 +54,8 @@ macro (build_executable TARGET_NAME)
4954

5055
include_directories (${WEBSOCKETPP_ROOT} ${WEBSOCKETPP_INCLUDE})
5156

57+
target_link_libraries(${TARGET_NAME} ${WEBSOCKETPP_PLATFORM_LIBS})
58+
5259
set_target_properties (${TARGET_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${WEBSOCKETPP_BIN})
5360
set_target_properties (${TARGET_NAME} PROPERTIES DEBUG_POSTFIX d)
5461
endmacro ()

0 commit comments

Comments
 (0)