diff --git a/.github/workflows/ci-linux.yaml b/.github/workflows/ci-linux.yaml index c19594b..8079c0a 100644 --- a/.github/workflows/ci-linux.yaml +++ b/.github/workflows/ci-linux.yaml @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/ci-windows.yaml b/.github/workflows/ci-windows.yaml index 16379e7..15fdf61 100644 --- a/.github/workflows/ci-windows.yaml +++ b/.github/workflows/ci-windows.yaml @@ -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 }} diff --git a/cmake/Includes/CMakeLists.txt b/cmake/Includes/CMakeLists.txt index 0e9ef28..81cb7ff 100644 --- a/cmake/Includes/CMakeLists.txt +++ b/cmake/Includes/CMakeLists.txt @@ -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} )