From 6b73b47b2d24e1fa93749192084d6e9ae2b7c04a Mon Sep 17 00:00:00 2001 From: Matus Novak <matusnov@gmail.com> Date: Tue, 6 Nov 2018 22:18:42 +0100 Subject: [PATCH] Fix mingw compilation errors added --output-on-failure to ctest --- appveyor.yml | 15 ++++----------- tests/CMakeLists.txt | 3 +++ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c7e308d..6c728a8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -67,17 +67,10 @@ build_script: - cmd: if [%COMPILER%]==[msvc] (cd build & cmake --build . --target ALL_BUILD --config MinSizeRel || exit 1 & cd ..) test_script: -- cmd: if [%COMPILER%]==[mingw] (cd build-debug & ctest --verbose || exit 1 & cd ..) -- cmd: if [%COMPILER%]==[mingw] (cd build-release & ctest --verbose || exit 1 & cd ..) -- cmd: if [%COMPILER%]==[msvc] (cd build & ctest --verbose -C "Debug" || exit 1 & cd ..) -- cmd: if [%COMPILER%]==[msvc] (cd build & ctest --verbose -C "MinSizeRel" || exit 1 & cd ..) - -after_test: -- cmd: if [%COMPILER%]==[mingw] (cd build-debug & cmake --build . --target install || exit 1 & cd ..) -- cmd: if [%COMPILER%]==[msvc] (cd build & cmake --build . --target INSTALL --config Debug || exit 1 & cd ..) -# - cmd: ren install debug -- cmd: if [%COMPILER%]==[mingw] (cd build-release & cmake --build . --target install || exit 1 & cd ..) -- cmd: if [%COMPILER%]==[msvc] (cd build & cmake --build . --target INSTALL --config MinSizeRel || exit 1 & cd ..) +- cmd: if [%COMPILER%]==[mingw] (cd build-debug & ctest --verbose --output-on-failure || exit 1 & cd ..) +- cmd: if [%COMPILER%]==[mingw] (cd build-release & ctest --verbose --output-on-failure || exit 1 & cd ..) +- cmd: if [%COMPILER%]==[msvc] (cd build & ctest --verbose --output-on-failure -C "Debug" || exit 1 & cd ..) +- cmd: if [%COMPILER%]==[msvc] (cd build & ctest --verbose --output-on-failure -C "MinSizeRel" || exit 1 & cd ..) #---------------------------------# # notifications # diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f383e6b..e4ddd8f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -13,6 +13,9 @@ foreach(FILENAME ${TESTS}) target_include_directories(${TEST_PROJ} PRIVATE ${CATCH2_INCLUDE_DIR}) target_link_libraries(${TEST_PROJ} ${CMAKE_THREAD_LIBS_INIT}) + if(WIN32) + target_link_libraries(${TEST_PROJ} wsock32 ws2_32) + endif() if(MSVC) set_target_properties(${TEST_PROJ} PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE") endif() -- GitLab