Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add compile def "MSGPACK_DEFAULT_API_VERSION=1" #236

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add compile def "MSGPACK_DEFAULT_API_VERSION=1" #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3ba646
Add compile def "MSGPACK_DEFAULT_API_VERSION=1"
CanNuhlar Oct 18, 2022
41b7801
Force MSGPACK_DEFAULT_API_VERSION=1 on conan builds
CanNuhlar Oct 20, 2022
ff235f0
Bump conan version on ci runners
CanNuhlar Oct 20, 2022
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
6 changes: 3 additions & 3 deletions .github/workflows/ci-linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
compiler: gcc
version: "10"
conan: true
cmake-args: -DCMAKE_PREFIX_PATH=`pwd`/build -DCMAKE_MODULE_PATH=`pwd`/build
cmake-args: -DCMAKE_PREFIX_PATH=`pwd`/build -DCMAKE_MODULE_PATH=`pwd`/build -DMSGPACK_DEFAULT_API_VERSION=1

- name: ubuntu-20.04-clang-10
os: ubuntu-20.04
Expand All @@ -38,7 +38,7 @@ jobs:
compiler: clang
version: "10"
conan: true
cmake-args: -DCMAKE_PREFIX_PATH=`pwd`/build -DCMAKE_MODULE_PATH=`pwd`/build -DAUTOBAHN_USE_LIBCXX=NO
cmake-args: -DCMAKE_PREFIX_PATH=`pwd`/build -DCMAKE_MODULE_PATH=`pwd`/build -DAUTOBAHN_USE_LIBCXX=NO -DMSGPACK_DEFAULT_API_VERSION=1

steps:
- uses: actions/checkout@v2
Expand All @@ -58,7 +58,7 @@ jobs:

- name: Install
run: |
python -m pip install cmake==3.22.2 conan==1.44.1 --upgrade
python -m pip install cmake==3.22.2 conan>=1.52.0 --upgrade

wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main' -y
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

- name: Install
run: |
python -m pip install cmake==3.22.2 conan==1.44.1 --upgrade
python -m pip install cmake==3.22.2 conan>=1.52.0 --upgrade
conan profile new default --detect --force
mkdir -p build && cd build
conan install .. --build=missing -s arch=${{ matrix.conan_arch }} -s build_type=${{ matrix.type }}
Expand Down
3 changes: 3 additions & 0 deletions cmake/Includes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ endif()
find_package(Boost REQUIRED COMPONENTS program_options system thread random)

find_package(msgpack REQUIRED)
# https://github.com/crossbario/autobahn-cpp/issues/95
add_compile_definitions(MSGPACK_DEFAULT_API_VERSION=1)

find_package(websocketpp REQUIRED)

MESSAGE( STATUS "AUTOBAHN_BUILD_EXAMPLES: " ${AUTOBAHN_BUILD_EXAMPLES} )
Expand Down