Skip to content

Commit ed7c537

Browse files
committed
chore: a couple of tweaks
1 parent ee3042f commit ed7c537

File tree

4 files changed

+33
-22
lines changed

4 files changed

+33
-22
lines changed

.github/workflows/default-ci.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: CMake Build
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [master]
66
pull_request:
7-
branches: [ master ]
7+
branches: [master]
88

99
jobs:
1010
build:
@@ -15,24 +15,24 @@ jobs:
1515
build_type: [Release, Debug]
1616
shared_library: [True, False]
1717
exclude:
18-
# Building a shared library is currently unsupported on Windows.
19-
- os: windows-latest
20-
shared_library: True
18+
# Building a shared library is currently unsupported on Windows.
19+
- os: windows-latest
20+
shared_library: True
2121

2222
steps:
23-
- uses: actions/checkout@v2
23+
- uses: actions/checkout@v2
2424

25-
- name: Configure CMake
26-
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required when using a single-configuration generator such as make.
27-
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
28-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DENTITYX_BUILD_SHARED=${{matrix.shared_library}}
25+
- name: Configure CMake
26+
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required when using a single-configuration generator such as make.
27+
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
28+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DENTITYX_BUILD_SHARED=${{matrix.shared_library}}
2929

30-
- name: Build
31-
# Build the library with the given configuration
32-
run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_type}}
30+
- name: Build
31+
# Build the library with the given configuration
32+
run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_type}}
3333

34-
- name: Test
35-
working-directory: ${{github.workspace}}/build
36-
# Execute tests defined by the CMake configuration.
37-
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
38-
run: ctest -C ${{matrix.build_type}}
34+
- name: Test
35+
working-directory: ${{github.workspace}}/build
36+
# Execute tests defined by the CMake configuration.
37+
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
38+
run: ctest -C ${{matrix.build_type}} --output-on-failure

.gitignore

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,15 @@ Makefile
88
html/
99
Vagrantfile
1010
.vagrant
11+
CMakeLists.txt.user
12+
CMakeCache.txt
13+
CMakeFiles
14+
CMakeScripts
15+
Testing
16+
Makefile
17+
cmake_install.cmake
18+
install_manifest.txt
19+
compile_commands.json
20+
CTestTestfile.cmake
21+
_deps
22+
CMakeUserPresets.json

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ endif ()
8686

8787

8888
# Misc features
89-
check_include_file("stdint.h" HAVE_STDINT_H)
89+
check_include_file("cstdint" HAVE_STDINT_H)
9090

9191
macro(require FEATURE_NAME MESSAGE_STRING)
9292
if (NOT ${${FEATURE_NAME}})
@@ -121,7 +121,7 @@ if (NOT CMAKE_BUILD_TYPE)
121121
endif()
122122

123123
message(STATUS "-- Checking misc features")
124-
require(HAVE_STDINT_H "stdint.h")
124+
require(HAVE_STDINT_H "cstdint")
125125

126126
# Things to install
127127

@@ -146,7 +146,7 @@ if (ENTITYX_BUILD_SHARED)
146146
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
147147
else()
148148
add_library(entityx STATIC ${sources})
149-
set_target_properties(entityx PROPERTIES
149+
set_target_properties(entityx PROPERTIES
150150
DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}"
151151
FOLDER entityx)
152152
set(install_libs entityx)

entityx/help/Pool_test.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#define CATCH_CONFIG_MAIN
1212

13-
#include <vector>
1413
#include "entityx/3rdparty/catch.hpp"
1514
#include "entityx/help/Pool.h"
1615

0 commit comments

Comments
 (0)