Merge branch 'pr/502' into develop

Author: Peter Thorson

.gitignore

@@ -90,3 +90,5 @@ examples/wsperf/wsperf_client
 install
 Makefile
 bin
+
+Testing/Temporary/CTestCostData.txt

CMakeLists.txt

@@ -69,6 +69,8 @@ option (BUILD_TESTS "Build websocketpp tests." FALSE)
 
 if (BUILD_TESTS OR BUILD_EXAMPLES)
 
+    enable_testing ()
+
     ############ Compiler specific setup
 
     set (WEBSOCKETPP_PLATFORM_LIBS "")
@@ -190,6 +192,10 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
 		set (Boost_USE_STATIC_LIBS TRUE)
 	endif ()
 
+    if (NOT Boost_USE_STATIC_LIBS)
+        add_definitions (/DBOOST_TEST_DYN_LINK)
+    endif ()
+
     set (Boost_FIND_REQUIRED TRUE)
     set (Boost_FIND_QUIETLY TRUE)
     set (Boost_DEBUG FALSE)

cmake/CMakeHelpers.cmake

@@ -15,6 +15,11 @@ macro (print_used_build_config)
     message (STATUS "WEBSOCKETPP_PLATFORM_LIBS     = ${WEBSOCKETPP_PLATFORM_LIBS}")
     message (STATUS "WEBSOCKETPP_PLATFORM_TLS_LIBS = ${WEBSOCKETPP_PLATFORM_TLS_LIBS}")
     message ("") 
+    message (STATUS "OPENSSL_FOUND        = ${OPENSSL_FOUND}")
+    message (STATUS "OPENSSL_INCLUDE_DIR     = ${OPENSSL_INCLUDE_DIR}")
+    message (STATUS "OPENSSL_LIBRARIES = ${OPENSSL_LIBRARIES}")
+    message (STATUS "OPENSSL_VERSION = ${OPENSSL_VERSION}")
+    message ("") 
 endmacro ()
 
 # Adds the given folder_name into the source files of the current project. 
@@ -49,10 +54,23 @@ macro (build_executable TARGET_NAME)
 
     include_directories (${WEBSOCKETPP_ROOT} ${WEBSOCKETPP_INCLUDE})
 
+    target_link_libraries(${TARGET_NAME} ${WEBSOCKETPP_PLATFORM_LIBS})
+
     set_target_properties (${TARGET_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${WEBSOCKETPP_BIN})
     set_target_properties (${TARGET_NAME} PROPERTIES DEBUG_POSTFIX d)
 endmacro ()
 
+# Build executable and register as test
+macro (build_test TARGET_NAME)
+    build_executable (${TARGET_NAME} ${ARGN})
+
+    if (${CMAKE_VERSION} VERSION_LESS 3)
+        message(WARNING "CMake too old to register ${TARGET_NAME} as a test")
+    else ()
+        add_test(NAME ${TARGET_NAME} COMMAND $<TARGET_FILE:${TARGET_NAME}>)
+    endif ()
+endmacro ()
+
 # Finalize target for all types
 macro (final_target)
     if ("${TARGET_LIB_TYPE}" STREQUAL "EXECUTABLE")

test/connection/CMakeLists.txt

@@ -4,7 +4,7 @@ file (GLOB HEADER_FILES *.hpp)
 
 init_target (test_connection)
 
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+build_test (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
 
 link_boost ()
 final_target ()

test/endpoint/CMakeLists.txt

@@ -6,7 +6,7 @@ if (OPENSSL_FOUND)
 
 init_target (test_endpoint)
 
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+build_test (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
 
 link_boost ()
 link_openssl ()

test/extension/CMakeLists.txt

@@ -13,7 +13,7 @@ if ( ZLIB_FOUND )
 file (GLOB SOURCE permessage_deflate.cpp)
 
 init_target (test_permessage_deflate)
-build_executable (${TARGET_NAME} ${SOURCE})
+build_test (${TARGET_NAME} ${SOURCE})
 link_boost ()
 link_zlib()
 final_target ()

test/http/CMakeLists.txt

@@ -3,7 +3,7 @@ file (GLOB SOURCE_FILES parser.cpp)
 
 init_target (test_http)
 
-build_executable (${TARGET_NAME} ${SOURCE_FILES})
+build_test (${TARGET_NAME} ${SOURCE_FILES})
 
 link_boost ()
 final_target ()

test/logger/CMakeLists.txt

@@ -4,7 +4,7 @@ file (GLOB HEADER_FILES *.hpp)
 
 init_target (test_logger)
 
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+build_test (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
 
 link_boost ()
 final_target ()

test/message_buffer/CMakeLists.txt

@@ -11,7 +11,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
 file (GLOB SOURCE message.cpp)
 
 init_target (test_message_buffer)
-build_executable (${TARGET_NAME} ${SOURCE})
+build_test (${TARGET_NAME} ${SOURCE})
 link_boost ()
 final_target ()
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")

test/processors/CMakeLists.txt

@@ -2,7 +2,7 @@
 file (GLOB SOURCE processor.cpp)
 
 init_target (test_processor)
-build_executable (${TARGET_NAME} ${SOURCE})
+build_test (${TARGET_NAME} ${SOURCE})
 link_boost ()
 final_target ()
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
@@ -11,7 +11,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
 file (GLOB SOURCE hybi00.cpp)
 
 init_target (test_processor_hybi00)
-build_executable (${TARGET_NAME} ${SOURCE})
+build_test (${TARGET_NAME} ${SOURCE})
 link_boost ()
 final_target ()
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
@@ -20,7 +20,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
 file (GLOB SOURCE hybi07.cpp)
 
 init_target (test_processor_hybi07)
-build_executable (${TARGET_NAME} ${SOURCE})
+build_test (${TARGET_NAME} ${SOURCE})
 link_boost ()
 final_target ()
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
@@ -29,7 +29,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
 file (GLOB SOURCE hybi08.cpp)
 
 init_target (test_processor_hybi08)
-build_executable (${TARGET_NAME} ${SOURCE})
+build_test (${TARGET_NAME} ${SOURCE})
 link_boost ()
 final_target ()
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
@@ -40,7 +40,7 @@ if (ZLIB_FOUND)
 file (GLOB SOURCE hybi13.cpp)
 
 init_target (test_processor_hybi13)
-build_executable (${TARGET_NAME} ${SOURCE})
+build_test (${TARGET_NAME} ${SOURCE})
 link_boost ()
 link_zlib()
 final_target ()
@@ -50,7 +50,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
 file (GLOB SOURCE extension_permessage_compress.cpp)
 
 init_target (test_processor_extension_permessage_compress)
-build_executable (${TARGET_NAME} ${SOURCE})
+build_test (${TARGET_NAME} ${SOURCE})
 link_boost ()
 link_zlib()
 final_target ()