Skip to content

Commit 4546f9b

Browse files
Merge branch 'github-action-test'
2 parents 2763f04 + acec7ff commit 4546f9b

File tree

4 files changed

+37
-6
lines changed

4 files changed

+37
-6
lines changed

.github/workflows/main.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: main
2+
on: [push, pull_request]
3+
jobs:
4+
build:
5+
runs-on: ${{ matrix.os }}
6+
strategy:
7+
matrix:
8+
os: [ubuntu-latest, windows-latest, macos-latest]
9+
steps:
10+
- uses: actions/checkout@v2
11+
with:
12+
submodules: recursive
13+
- name: install Boost on Ubuntu
14+
if: matrix.os == 'ubuntu-latest'
15+
run: sudo apt-get install libboost-all-dev
16+
- name: Set Boost on Windows
17+
if: matrix.os == 'windows-latest'
18+
run: echo "::set-env name=BOOST_ROOT::$env:BOOST_ROOT_1_72_0"
19+
- name: install Boost on MacOS
20+
if: matrix.os == 'macos-latest'
21+
run: brew install boost
22+
- name: configure
23+
run: cmake -Bbuild -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON
24+
- name: build
25+
run: cmake --build build
26+
- name: test
27+
run: cd build && ctest -VV

ReadMe.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# mFAST [![Build Status](https://travis-ci.org/objectcomputing/mFAST.svg?branch=master)](https://travis-ci.org/objectcomputing/mFAST)[![Build status](https://ci.appveyor.com/api/projects/status/0rkg9d8ey6kidmrd?svg=true)](https://ci.appveyor.com/project/huangminghuang/mfast)
2-
1+
# mFAST [![Actions Status](https://github.com/objectcomputing/mFAST/workflows/main/badge.svg)](https://github.com/objectcomputing/mFAST/actions)
32

43
### Introduction
54

cmake/SetCXXStandard.cmake

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11

2+
find_package(Boost 1.59.0 REQUIRED)
3+
if(Boost_VERSION VERSION_LESS "1.72.0")
4+
set(CMAKE_CXX_STANDARD 11 CACHE INTERNAL "specifies the C++ standard whose features are requested to build this target")
5+
else()
6+
set(CMAKE_CXX_STANDARD 14 CACHE INTERNAL "specifies the C++ standard whose features are requested to build this target")
7+
endif()
28

3-
set(CMAKE_CXX_STANDARD 11 CACHE INTERNAL "specifies the C++ standard whose features are requested to build this target")
49
set(CMAKE_CXX_STANDARD_REQUIRED ON)
510
if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
611
### Even though CMAKE_CXX_STANDARD_REQUIRED is supported since CMake 3.1, it doesn't work for Emscripten em++ together with
712
### Cmake 3.6.
8-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++${CMAKE_CXX_STANDARD}")
13+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++${CMAKE_CXX_STANDARD}")
914
endif()

src/mfast/coder/encoder/encoder_presence_map.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
// See the file license.txt for licensing information.
66
#pragma once
77

8-
#include <boost/detail/endian.hpp>
8+
#include <boost/predef/other/endian.h>
99
#include "fast_ostream.h"
1010

1111
namespace mfast {
12-
#ifdef BOOST_BIG_ENDIAN
12+
#if BOOST_ENDIAN_BIG_BYTE
1313
const int SMALLEST_ADDRESS_BYTE = sizeof(std::size_t) - 1;
1414
#else
1515
const int SMALLEST_ADDRESS_BYTE = 0;

0 commit comments

Comments
 (0)