Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mtxclient
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nheko Reborn
mtxclient
Commits
27dc41bc
Commit
27dc41bc
authored
5 years ago
by
Nicolas Werner
Browse files
Options
Downloads
Patches
Plain Diff
Bump required c++ version to C++17
parent
aa8bb856
No related branches found
No related tags found
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
.gitignore
+4
-1
4 additions, 1 deletion
.gitignore
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
Dockerfile
+3
-3
3 additions, 3 deletions
Dockerfile
README.md
+1
-1
1 addition, 1 deletion
README.md
deps/cmake/Boost.cmake
+1
-1
1 addition, 1 deletion
deps/cmake/Boost.cmake
with
10 additions
and
7 deletions
.gitignore
+
4
−
1
View file @
27dc41bc
...
...
@@ -28,11 +28,14 @@
*.app
# Build artifacts
build/
build
*
/
# Editor
tags
compile_commands.json
.exrc
.ccls-cache/
.clangd/
# Synapse data
data/
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
1
−
1
View file @
27dc41bc
...
...
@@ -10,7 +10,7 @@ option(IWYU "Check headers with include-what-you-use" OFF)
option
(
BUILD_SHARED_LIBS
"Specifies whether to build mtxclient as a shared library lib or not"
ON
)
set
(
CMAKE_MODULE_PATH
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake
)
set
(
CMAKE_CXX_STANDARD 1
4
)
set
(
CMAKE_CXX_STANDARD 1
7
)
set
(
CMAKE_CXX_STANDARD_REQUIRED ON
)
set
(
CMAKE_POSITION_INDEPENDENT_CODE ON
)
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
3
−
3
View file @
27dc41bc
FROM
ubuntu:1
4
.04
FROM
ubuntu:1
6
.04
ENV
LIBSODIUM_VERSION=1.0.16
ENV
SPDLOG_VERSION=1.1.0
...
...
@@ -18,7 +18,7 @@ RUN \
# Toolchains
add-apt-repository -y ppa:ubuntu-toolchain-r/test && \
curl -L https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
apt-add-repository "deb https://apt.llvm.org/
trusty
/ llvm-toolchain-
trusty
-6.0 main" && \
apt-add-repository "deb https://apt.llvm.org/
xenial
/ llvm-toolchain-
xenial
-6.0 main" && \
apt-get update -qq && \
apt-get install -y --no-install-recommends \
ninja-build \
...
...
@@ -57,7 +57,7 @@ RUN \
curl -L https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.gz -o boost_1_70_0.tar.gz && \
tar xfz boost_1_70_0.tar.gz && cd /build/boost/boost_1_70_0/ && \
./bootstrap.sh --with-libraries=random,thread,system,iostreams,atomic,chrono,date_time,regex && \
./b2 -d0 cxxstd=1
4
variant=release link=static threading=multi --layout=system && \
./b2 -d0 cxxstd=1
7
variant=release link=static threading=multi --layout=system && \
./b2 -d0 install && \
# Gtest
mkdir -p /build/gtest && cd /build/gtest && \
...
...
This diff is collapsed.
Click to expand it.
README.md
+
1
−
1
View file @
27dc41bc
...
...
@@ -13,7 +13,7 @@ Client API library for the Matrix protocol, built on top of Boost.Asio.
-
Boost 1.70 (includes Boost.Beast and makes the strand interface usable)
-
OpenSSL
-
C++ 1
4
compiler
-
C++ 1
7
compiler
-
CMake 3.15 or greater (lower versions can work, but they tend to mess up linking the right boost libraries)
-
Google Test (for testing)
-
libsodium 1.0.14 or greater
...
...
This diff is collapsed.
Click to expand it.
deps/cmake/Boost.cmake
+
1
−
1
View file @
27dc41bc
...
...
@@ -16,7 +16,7 @@ ExternalProject_Add(
CONFIGURE_COMMAND
${
DEPS_BUILD_DIR
}
/boost/bootstrap.sh
--with-libraries=random,thread,system,iostreams,atomic,chrono,date_time,regex
--prefix=
${
DEPS_INSTALL_DIR
}
BUILD_COMMAND
${
DEPS_BUILD_DIR
}
/boost/b2 -d0 cxxstd=1
4
variant=release link=shared runtime-link=shared threading=multi --layout=system
BUILD_COMMAND
${
DEPS_BUILD_DIR
}
/boost/b2 -d0 cxxstd=1
7
variant=release link=shared runtime-link=shared threading=multi --layout=system
INSTALL_COMMAND
${
DEPS_BUILD_DIR
}
/boost/b2 -d0 install
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment