Skip to content
Open
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
30 changes: 30 additions & 0 deletions .github/workflows/Linux-clang.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: "Linux Clang"

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

env:
BUILD_TYPE: Release
CXX: clang++-9

jobs:
job:
name: "Linux Clang"
runs-on: ubuntu-latest
strategy:
fail-fast: false

steps:
- uses: actions/checkout@v2
with:
submodules: true

- name: Configure
run: mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=../bin ..
- name: Build
run: cmake --build build
- name: Install
run: cmake --install build
30 changes: 30 additions & 0 deletions .github/workflows/Linux-gcc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: "Linux GCC"

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

env:
BUILD_TYPE: Release
CXX: g++-9

jobs:
job:
name: "Linux GCC"
runs-on: ubuntu-latest
strategy:
fail-fast: false

steps:
- uses: actions/checkout@v2
with:
submodules: true

- name: Configure
run: mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=../bin ..
- name: Build
run: cmake --build build
- name: Install
run: cmake --install build
27 changes: 27 additions & 0 deletions .github/workflows/Windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Windows

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
job:
name: Windows
runs-on: windows-latest
strategy:
fail-fast: false

steps:
- uses: actions/checkout@v2
with:
submodules: true

- name: Configure
run: mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=../bin ..
- name: Build
run: cmake --build build
# - name: Install
# run: cmake --install build

29 changes: 29 additions & 0 deletions .github/workflows/macOS.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: macOS

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

env:
BUILD_TYPE: Release

jobs:
job:
name: macOS
runs-on: macos-latest
strategy:
fail-fast: false

steps:
- uses: actions/checkout@v2
with:
submodules: true

- name: Configure
run: mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=../bin ..
- name: Build
run: cmake --build build
- name: Install
run: cmake --install build
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# @author Frank Gaede, DESY
# @author Jan Engels, DESY
# @author Remi Ete, DESY
CMAKE_MINIMUM_REQUIRED( VERSION 2.8 FATAL_ERROR )
CMAKE_MINIMUM_REQUIRED( VERSION 3.4 FATAL_ERROR )
########################################################

# project name
Expand All @@ -18,6 +18,8 @@ SET( SIO_VERSION_PATCH 2 )

LIST( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake )

SET(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)

# options
OPTION( SIO_EXAMPLES "Switch ON to build SIO examples" ON )
OPTION( INSTALL_DOC "Set to OFF to skip build/install Documentation" OFF )
Expand Down
4 changes: 3 additions & 1 deletion cmake/SIOBuild.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -289,5 +289,7 @@ ENDFOREACH()
IF( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9 )
SET( CMAKE_CXX_FLAGS "-fdiagnostics-color=auto ${CMAKE_CXX_FLAGS}" )
ENDIF()

IF( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
SET( CMAKE_CXX_FLAGS "/permissive- ${CMAKE_CXX_FLAGS}" )
ENDIF()
INSTALL( FILES cmake/MacroCheckPackageLibs.cmake cmake/MacroCheckPackageVersion.cmake DESTINATION lib/cmake )
1 change: 1 addition & 0 deletions source/include/sio/api.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <string>
#include <sstream>
#include <vector>
#include <algorithm>

namespace sio {

Expand Down
3 changes: 3 additions & 0 deletions source/include/sio/definitions.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
#include <map>
#include <string>
#include <memory>
#ifdef _WIN32
#define NOMINMAX
#endif
#ifdef __APPLE__
#include <_types.h>
#include <_types/_uint16_t.h>
Expand Down