Skip to content
This repository was archived by the owner on Mar 22, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions .github/workflows/gha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,12 @@ jobs:
MSBUILD: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\MSBuild\\Current\\Bin"
strategy:
matrix:
CONFIG: [Debug, Release]
BUILD_TYPE: [Debug, Release]
CXX_STANDARD: [14]
include:
- BUILD_TYPE: RelWithDebInfo
CXX_STANDARD: 17

steps:
- name: Update PATH
run: echo "${env:MSBUILD}" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
Expand Down Expand Up @@ -141,19 +146,20 @@ jobs:
run: cmake . -Bbuild
-G "${env:GENERATOR}"
-A "${env:ARCH}"
-DCMAKE_BUILD_TYPE="${{ matrix.CONFIG }}"
-DCMAKE_BUILD_TYPE="${{ matrix.BUILD_TYPE }}"
-DCMAKE_TOOLCHAIN_FILE="${env:CMAKE_TOOLCHAIN_FILE}"
-DCMAKE_INSTALL_PREFIX="${env:CMAKE_INSTALL_PREFIX}"
-DTESTS_USE_FORCED_PMEM=ON
-DTESTS_TBB=ON
-DDEVELOPER_MODE=ON
-DCXX_STANDARD="${{ matrix.CXX_STANDARD }}"

- name: Build
run: msbuild build/ALL_BUILD.vcxproj /property:Configuration=${{ matrix.CONFIG }} /verbosity:minimal /m
run: msbuild build/ALL_BUILD.vcxproj /property:Configuration=${{ matrix.BUILD_TYPE }} /verbosity:minimal /m

- name: Tests
working-directory: build
run: ctest -C ${{ matrix.CONFIG }} --output-on-failure --timeout "${env:TEST_TIMEOUT}"
run: ctest -C ${{ matrix.BUILD_TYPE }} --output-on-failure --timeout "${env:TEST_TIMEOUT}"

- name: Install
working-directory: build
Expand Down
16 changes: 6 additions & 10 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,12 @@ if(CURSES_FOUND)
add_example(pman pman/pman.cpp)
target_include_directories(example-pman PUBLIC ${CURSES_INCLUDE_DIR})
target_link_libraries(example-pman ${CURSES_LIBRARIES})
else()
message(WARNING "ncurses not found - pman won't be build")

add_example(panaconda panaconda/panaconda.cpp)
target_include_directories(example-panaconda PUBLIC ${CURSES_INCLUDE_DIR})
target_link_libraries(example-panaconda ${CURSES_LIBRARIES})
elseif(NOT WIN32)
message(WARNING "ncurses not found - pman and panaconda examples won't be build")
endif()

if(SFML_FOUND)
Expand Down Expand Up @@ -190,14 +194,6 @@ else()
message(WARNING "SFML 2.4 or newer not found - pmpong won't be build")
endif()

if(CURSES_FOUND)
add_example(panaconda panaconda/panaconda.cpp)
target_include_directories(example-panaconda PUBLIC ${CURSES_INCLUDE_DIR})
target_link_libraries(example-panaconda ${CURSES_LIBRARIES})
else()
message(WARNING "ncurses not found - panaconda won't be build")
endif()

add_example(map_cli map_cli/map_cli.cpp)

add_example(array array/array.cpp)
Expand Down
2 changes: 0 additions & 2 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,6 @@ if(BUILD_EXAMPLES AND NO_GCC_VARIADIC_TEMPLATE_BUG)
if(CURSES_FOUND AND NOT WIN32)
build_example_pman()
add_test_generic(NAME ex-pman CASE 0 TRACERS none SCRIPT ex-pman/ex-pman_0.cmake)
elseif(NOT WIN32)
message(WARNING "ncurses not found - pman test won't be build")
endif()
elseif(BUILD_EXAMPLES)
message(WARNING "Skipping examples tests because of gcc variadic template bug")
Expand Down