3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 15:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1843 from opedroso/WINDOWS_MAKE_TEST

Browse Source 
Problem: Tests do no build in Windows environment
This commit is contained in:
Pieter Hintjens 2016-03-05 22:12:26 +02:00
commit 2cd4c38b80
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/CMakeLists.txt
View File

@ -1,4 +1,8 @@
# CMake build script for ZeroMQ tests # CMake build script for ZeroMQ tests
cmake_minimum_required(VERSION "2.8.1")
# name of Windows project will tests.sln
PROJECT(tests)
set(tests set(tests
test_system test_system
@ -105,10 +109,26 @@ if(WITH_VMCI)
) )
endif() endif()
# add location of platform.hpp for Windows builds
if(WIN32)
add_definitions(-DZMQ_CUSTOM_PLATFORM_HPP)
include_directories(../builds/msvc)
link_libraries(Ws2_32.lib)
endif()
# add library and include dirs for all targets
link_libraries(libzmq)
include_directories("${CMAKE_SOURCE_DIR}/../include")
include_directories("${CMAKE_SOURCE_DIR}/src")
foreach(test ${tests}) foreach(test ${tests})
add_executable(${test} ${test}.cpp) add_executable(${test} ${test}.cpp)
target_include_directories(${test} PRIVATE "${CMAKE_SOURCE_DIR}/src") if(WIN32)
target_link_libraries(${test} libzmq) # it will only link correctly for DEBUG builds in Windows (I don't know how to specify the target and target library in CMake)
SET_TARGET_PROPERTIES( ${test} PROPERTIES LINK_FLAGS "/LIBPATH:../bin/Win32/Debug/v120/dynamic" )
else()
link_directories(${test} PRIVATE "${CMAKE_SOURCE_DIR}/../lib")
endif()
if(RT_LIBRARY) if(RT_LIBRARY)
target_link_libraries(${test} ${RT_LIBRARY} ) target_link_libraries(${test} ${RT_LIBRARY} )
@ -137,3 +157,4 @@ foreach(TEST_SOURCE ${ALL_TEST_SOURCES})
message(AUTHOR_WARNING "Test '${TESTNAME}' is not known to CTest.") message(AUTHOR_WARNING "Test '${TESTNAME}' is not known to CTest.")
endif() endif()
endforeach() endforeach()

10
tests/README.md
View File

@ -15,4 +15,12 @@ Please use only ANSI C99 in test cases, no C++. This is to make the code more re
On many slower environments, like embedded systems, VMs or CI systems, test might On many slower environments, like embedded systems, VMs or CI systems, test might
fail because it takes time for sockets to settle after a connect. If you need fail because it takes time for sockets to settle after a connect. If you need
to add a sleep, please be consistent with all the other tests and use: to add a sleep, please be consistent with all the other tests and use:
msleep (SETTLE_TIME); msleep (SETTLE_TIME);
# Building tests in Windows
Install CMAKE
CMD> CMAKE libzmq/tests
CMD> tests.sln
CMD> # build all projects in the solution