diff --git a/.ci/install.sh b/.ci/install.sh
index 776d4d23..f700f303 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -3,9 +3,6 @@
set -ex
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
- brew tap nlohmann/json
- brew install --with-cmake nlohmann_json
-
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
sudo python get-pip.py
@@ -25,11 +22,4 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
wget https://cmake.org/files/v3.15/cmake-3.15.5-Linux-x86_64.sh
sudo sh cmake-3.15.5-Linux-x86_64.sh --skip-license --prefix=/usr/local
-
- mkdir -p build-libsodium
- ( cd build-libsodium
- curl -L https://download.libsodium.org/libsodium/releases/libsodium-1.0.17.tar.gz -o libsodium-1.0.17.tar.gz
- tar xfz libsodium-1.0.17.tar.gz
- cd libsodium-1.0.17/
- ./configure && make && sudo make install )
fi
diff --git a/.ci/script.sh b/.ci/script.sh
index 7e9a8d81..0c6e3746 100755
--- a/.ci/script.sh
+++ b/.ci/script.sh
@@ -19,19 +19,32 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
export CMAKE_PREFIX_PATH=/usr/local/opt/qt5
fi
-# Build & install dependencies
-cmake -GNinja -Hdeps -B.deps \
- -DUSE_BUNDLED_BOOST="${USE_BUNDLED_BOOST}" \
- -DUSE_BUNDLED_CMARK="${USE_BUNDLED_CMARK}" \
- -DUSE_BUNDLED_JSON="${USE_BUNDLED_JSON}" \
- -DMTX_STATIC="${MTX_STATIC:-OFF}"
-cmake --build .deps
+mkdir -p .deps/usr .hunter
# Build nheko
+
+if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+cmake -GNinja -H. -Bbuild \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_PREFIX=.deps/usr \
+ -DHUNTER_ROOT=".hunter" \
+ -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHUNTER_CONFIGURATION_TYPES=RelWithDebInfo \
+ -DUSE_BUNDLED_OPENSSL=OFF \
+ -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl \
+ -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include \
+ -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 \
+ -DCI_BUILD=ON
+else
cmake -GNinja -H. -Bbuild \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=.deps/usr \
- -DBUILD_SHARED_LIBS=ON # weird workaround, as the boost 1.70 cmake files seem to be broken?
+ -DHUNTER_ROOT=".hunter" \
+ -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHUNTER_CONFIGURATION_TYPES=RelWithDebInfo \
+ -DUSE_BUNDLED_OPENSSL=OFF \
+ -DCI_BUILD=ON
+fi
cmake --build build
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
diff --git a/.travis.yml b/.travis.yml
index 1e2bc5b8..ce189749 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ notifications:
cache:
directories:
- - .deps
+ - .hunter
matrix:
include:
@@ -23,21 +23,12 @@ matrix:
osx_image: xcode10.2
env:
- DEPLOYMENT=1
- - USE_BUNDLED_BOOST=0
- - USE_BUNDLED_CMARK=0
- - USE_BUNDLED_JSON=0
- - MTX_STATIC=1
addons:
homebrew:
taps: nlohmann/json
packages:
- - boost
- clang-format
- cmake
- - cmark
- - icu4c
- - libsodium
- - lmdb
- ninja
- openssl
- qt5
@@ -48,9 +39,6 @@ matrix:
- CC=gcc-7
- QT_PKG=512
- DEPLOYMENT=1
- - USE_BUNDLED_BOOST=1
- - USE_BUNDLED_CMARK=1
- - USE_BUNDLED_JSON=1
addons:
apt:
sources:
@@ -73,9 +61,6 @@ matrix:
- CXX=g++-8
- CC=gcc-8
- QT_PKG=59
- - USE_BUNDLED_BOOST=1
- - USE_BUNDLED_CMARK=1
- - USE_BUNDLED_JSON=1
addons:
apt:
sources:
@@ -98,9 +83,6 @@ matrix:
- CXX=clang++-6.0
- CC=clang-6.0
- QT_PKG=59
- - USE_BUNDLED_BOOST=1
- - USE_BUNDLED_CMARK=1
- - USE_BUNDLED_JSON=1
addons:
apt:
sources:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67953cd4..d5faa4a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,17 +1,83 @@
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.13)
option(APPVEYOR_BUILD "Build on appveyor" OFF)
+option(CI_BUILD "Set when building in CI. Enables -Werror where possible" OFF)
option(ASAN "Compile with address sanitizers" OFF)
option(QML_DEBUGGING "Enable qml debugging" OFF)
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+set(
+ CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/toolchain.cmake"
+ CACHE
+ FILEPATH "Default toolchain"
+ )
+
+
+option(HUNTER_ENABLED "Enable Hunter package manager" OFF)
+include("cmake/HunterGate.cmake")
+HunterGate(
+ URL "https://github.com/cpp-pm/hunter/archive/v0.23.244.tar.gz"
+ SHA1 "2c0f491fd0b80f7b09e3d21adb97237161ef9835"
+ LOCAL
+ )
+
+option(USE_BUNDLED_BOOST "Use the bundled version of Boost." ${HUNTER_ENABLED})
+option(USE_BUNDLED_SPDLOG "Use the bundled version of spdlog."
+ ${HUNTER_ENABLED})
+option(USE_BUNDLED_OLM "Use the bundled version of libolm." ${HUNTER_ENABLED})
+option(USE_BUNDLED_GTEST "Use the bundled version of Google Test."
+ ${HUNTER_ENABLED})
+option(USE_BUNDLED_CMARK "Use the bundled version of cmark."
+ ${HUNTER_ENABLED})
+option(USE_BUNDLED_JSON "Use the bundled version of nlohmann json."
+ ${HUNTER_ENABLED})
+option(USE_BUNDLED_OPENSSL "Use the bundled version of OpenSSL."
+ ${HUNTER_ENABLED})
+option(USE_BUNDLED_MTXCLIENT "Use the bundled version of the Matrix Client library." ${HUNTER_ENABLED})
+option(USE_BUNDLED_SODIUM "Use the bundled version of libsodium."
+ ${HUNTER_ENABLED})
+option(USE_BUNDLED_ZLIB "Use the bundled version of zlib."
+ ${HUNTER_ENABLED})
+option(USE_BUNDLED_LMDB "Use the bundled version of lmdb."
+ ${HUNTER_ENABLED})
+option(USE_BUNDLED_LMDBXX "Use the bundled version of lmdb++."
+ ${HUNTER_ENABLED})
+option(USE_BUNDLED_TWEENY "Use the bundled version of tweeny."
+ ${HUNTER_ENABLED})
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
+if(${CMAKE_VERSION} VERSION_LESS "3.14.0")
+ message("Adding FetchContent_MakeAvailable")
+ # from cmakes sources
+ macro(FetchContent_MakeAvailable)
+
+ foreach(contentName IN ITEMS ${ARGV})
+ string(TOLOWER ${contentName} contentNameLower)
+ FetchContent_GetProperties(${contentName})
+ if(NOT ${contentNameLower}_POPULATED)
+ FetchContent_Populate(${contentName})
+
+ # Only try to call add_subdirectory() if the populated content
+ # can be treated that way. Protecting the call with the check
+ # allows this function to be used for projects that just want
+ # to ensure the content exists, such as to provide content at
+ # a known location.
+ if(EXISTS ${${contentNameLower}_SOURCE_DIR}/CMakeLists.txt)
+ add_subdirectory(${${contentNameLower}_SOURCE_DIR}
+ ${${contentNameLower}_BINARY_DIR})
+ endif()
+ endif()
+ endforeach()
+
+ endmacro()
+endif()
include(GNUInstallDirs)
# Include Qt basic functions
include(QtCommon)
-project(nheko LANGUAGES C CXX)
+project(nheko LANGUAGES CXX C)
set(CPACK_PACKAGE_VERSION_MAJOR "0")
set(CPACK_PACKAGE_VERSION_MINOR "7")
set(CPACK_PACKAGE_VERSION_PATCH "0")
@@ -30,39 +96,42 @@ set(IDENTIFIER "com.github.mujx.nheko")
add_project_meta(META_FILES_TO_INCLUDE)
-if(APPLE)
- set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)
-endif()
-
if(NOT MSVC AND NOT APPLE)
- set(THREADS_PREFER_PTHREAD_FLAG ON)
- find_package(Threads REQUIRED)
+ set(THREADS_PREFER_PTHREAD_FLAG ON)
+ find_package(Threads REQUIRED)
endif()
if (BUILD_DOCS)
- find_package(Doxygen)
+ find_package(Doxygen)
- if (DOXYGEN_FOUND)
- set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Doxyfile.in)
- set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+ if (DOXYGEN_FOUND)
+ set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Doxyfile.in)
+ set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
- configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT})
+ configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT})
- add_custom_target(docs ALL
- COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMENT "Generating API documentation with Doxygen"
- VERBATIM )
- else (DOXYGEN_FOUND)
- message("Doxygen need to be installed to generate the doxygen documentation")
- endif (DOXYGEN_FOUND)
+ add_custom_target(docs ALL
+ COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ COMMENT "Generating API documentation with Doxygen"
+ VERBATIM )
+ else (DOXYGEN_FOUND)
+ message("Doxygen need to be installed to generate the doxygen documentation")
+ endif (DOXYGEN_FOUND)
endif()
#
# LMDB
#
-include(LMDB)
+#include(LMDB)
+if(USE_BUNDLED_LMDB)
+ hunter_add_package(lmdb)
+ find_package(liblmdb CONFIG REQUIRED)
+else()
+ include(FindPkgConfig)
+ pkg_search_module(lmdb REQUIRED IMPORTED_TARGET lmdb)
+endif()
#
# Discover Qt dependencies.
@@ -72,86 +141,76 @@ find_package(Qt5QuickCompiler)
find_package(Qt5DBus)
if (APPLE)
- find_package(Qt5MacExtras REQUIRED)
+ find_package(Qt5MacExtras REQUIRED)
endif(APPLE)
if (Qt5Widgets_FOUND)
- if (Qt5Widgets_VERSION VERSION_LESS 5.7.0)
- message(STATUS "Qt version ${Qt5Widgets_VERSION}")
- message(WARNING "Minimum supported Qt5 version is 5.7!")
- endif()
+ if (Qt5Widgets_VERSION VERSION_LESS 5.9.0)
+ message(STATUS "Qt version ${Qt5Widgets_VERSION}")
+ message(WARNING "Minimum supported Qt5 version is 5.9!")
+ endif()
endif(Qt5Widgets_FOUND)
-#
-# Set up compiler flags.
-#
-if (NOT MSVC)
- set(CMAKE_C_COMPILER gcc)
-endif(NOT MSVC)
-
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
if(NOT MSVC)
- set(
- CMAKE_CXX_FLAGS
- "${CMAKE_CXX_FLAGS} \
- -Wall \
- -Wextra \
- -Werror \
- -pipe \
- -pedantic \
- -fsized-deallocation \
- -fdiagnostics-color=always \
- -Wunreachable-code \
- -std=c++17"
- )
- if (NOT CMAKE_COMPILER_IS_GNUCXX)
- # -Wshadow is buggy and broken in GCC, so do not enable it.
- # see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79328
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow")
- endif()
+ set(
+ CMAKE_CXX_FLAGS
+ "${CMAKE_CXX_FLAGS} \
+ -Wall \
+ -Wextra \
+ -pipe \
+ -pedantic \
+ -fsized-deallocation \
+ -fdiagnostics-color=always \
+ -Wunreachable-code \
+ -std=c++17"
+ )
+ if (NOT CMAKE_COMPILER_IS_GNUCXX)
+ # -Wshadow is buggy and broken in GCC, so do not enable it.
+ # see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79328
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow")
+ endif()
endif()
if (MSVC)
- set(
- CMAKE_CXX_FLAGS
- "${CMAKE_CXX_FLAGS} /bigobj"
- )
+ set(
+ CMAKE_CXX_FLAGS
+ "${CMAKE_CXX_FLAGS} /bigobj"
+ )
endif()
if(NOT (CMAKE_BUILD_TYPE OR CMAKE_CONFIGURATION_TYPES))
- set(CMAKE_BUILD_TYPE "Debug" CACHE STRING
- "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
- FORCE)
- message("Setting build type to '${CMAKE_BUILD_TYPE}'")
+ set(CMAKE_BUILD_TYPE "Debug" CACHE STRING
+ "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
+ FORCE)
+ message("Setting build type to '${CMAKE_BUILD_TYPE}'")
else(NOT (CMAKE_BUILD_TYPE OR CMAKE_CONFIGURATION_TYPES))
- message("Build type set to '${CMAKE_BUILD_TYPE}'")
+ message("Build type set to '${CMAKE_BUILD_TYPE}'")
endif(NOT (CMAKE_BUILD_TYPE OR CMAKE_CONFIGURATION_TYPES))
set(SPDLOG_DEBUG_ON false)
# Windows doesn't handle CMAKE_BUILD_TYPE.
if(NOT WIN32)
- if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
- set(SPDLOG_DEBUG_ON true)
- else()
- set(SPDLOG_DEBUG_ON false)
- endif()
+ if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+ set(SPDLOG_DEBUG_ON true)
+ else()
+ set(SPDLOG_DEBUG_ON false)
+ endif()
endif()
find_program(GIT git)
if(GIT)
- execute_process(
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- COMMAND ${GIT} rev-parse --short HEAD
- OUTPUT_VARIABLE GIT_OUT OUTPUT_STRIP_TRAILING_WHITESPACE
- )
- if(GIT_OUT)
- set(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}-${GIT_OUT}")
- else()
- set(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}")
- endif()
+ execute_process(
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+ COMMAND ${GIT} rev-parse --short HEAD
+ OUTPUT_VARIABLE GIT_OUT OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ if(GIT_OUT)
+ set(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}-${GIT_OUT}")
+ else()
+ set(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}")
+ endif()
endif(GIT)
set(CPACK_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
@@ -168,220 +227,275 @@ configure_file(cmake/nheko.h config/nheko.h)
# Declare source and header files.
#
set(SRC_FILES
- # Dialogs
- src/dialogs/CreateRoom.cpp
- src/dialogs/ImageOverlay.cpp
- src/dialogs/PreviewUploadOverlay.cpp
- src/dialogs/InviteUsers.cpp
- src/dialogs/JoinRoom.cpp
- src/dialogs/MemberList.cpp
- src/dialogs/LeaveRoom.cpp
- src/dialogs/Logout.cpp
- src/dialogs/UserProfile.cpp
- src/dialogs/ReadReceipts.cpp
- src/dialogs/ReCaptcha.cpp
- src/dialogs/RoomSettings.cpp
+ # Dialogs
+ src/dialogs/CreateRoom.cpp
+ src/dialogs/ImageOverlay.cpp
+ src/dialogs/PreviewUploadOverlay.cpp
+ src/dialogs/InviteUsers.cpp
+ src/dialogs/JoinRoom.cpp
+ src/dialogs/MemberList.cpp
+ src/dialogs/LeaveRoom.cpp
+ src/dialogs/Logout.cpp
+ src/dialogs/UserProfile.cpp
+ src/dialogs/ReadReceipts.cpp
+ src/dialogs/ReCaptcha.cpp
+ src/dialogs/RoomSettings.cpp
- # Emoji
- src/emoji/Category.cpp
- src/emoji/ItemDelegate.cpp
- src/emoji/Panel.cpp
- src/emoji/PickButton.cpp
- src/emoji/Provider.cpp
+ # Emoji
+ src/emoji/Category.cpp
+ src/emoji/ItemDelegate.cpp
+ src/emoji/Panel.cpp
+ src/emoji/PickButton.cpp
+ src/emoji/Provider.cpp
- # Timeline
- src/timeline/TimelineViewManager.cpp
- src/timeline/TimelineModel.cpp
- src/timeline/DelegateChooser.cpp
+ # Timeline
+ src/timeline/TimelineViewManager.cpp
+ src/timeline/TimelineModel.cpp
+ src/timeline/DelegateChooser.cpp
- # UI components
- src/ui/Avatar.cpp
- src/ui/Badge.cpp
- src/ui/LoadingIndicator.cpp
- src/ui/InfoMessage.cpp
- src/ui/FlatButton.cpp
- src/ui/FloatingButton.cpp
- src/ui/Label.cpp
- src/ui/OverlayModal.cpp
- src/ui/SnackBar.cpp
- src/ui/RaisedButton.cpp
- src/ui/Ripple.cpp
- src/ui/RippleOverlay.cpp
- src/ui/OverlayWidget.cpp
- src/ui/TextField.cpp
- src/ui/TextLabel.cpp
- src/ui/ToggleButton.cpp
- src/ui/Theme.cpp
- src/ui/ThemeManager.cpp
+ # UI components
+ src/ui/Avatar.cpp
+ src/ui/Badge.cpp
+ src/ui/LoadingIndicator.cpp
+ src/ui/InfoMessage.cpp
+ src/ui/FlatButton.cpp
+ src/ui/FloatingButton.cpp
+ src/ui/Label.cpp
+ src/ui/OverlayModal.cpp
+ src/ui/SnackBar.cpp
+ src/ui/RaisedButton.cpp
+ src/ui/Ripple.cpp
+ src/ui/RippleOverlay.cpp
+ src/ui/OverlayWidget.cpp
+ src/ui/TextField.cpp
+ src/ui/TextLabel.cpp
+ src/ui/ToggleButton.cpp
+ src/ui/Theme.cpp
+ src/ui/ThemeManager.cpp
- src/AvatarProvider.cpp
- src/Cache.cpp
- src/ChatPage.cpp
- src/CommunitiesListItem.cpp
- src/CommunitiesList.cpp
- src/EventAccessors.cpp
- src/InviteeItem.cpp
- src/LoginPage.cpp
- src/Logging.cpp
- src/MainWindow.cpp
- src/MatrixClient.cpp
- src/MxcImageProvider.cpp
- src/ColorImageProvider.cpp
- src/QuickSwitcher.cpp
- src/Olm.cpp
- src/RegisterPage.cpp
- src/RoomInfoListItem.cpp
- src/RoomList.cpp
- src/RunGuard.cpp
- src/SideBarActions.cpp
- src/Splitter.cpp
- src/popups/SuggestionsPopup.cpp
- src/popups/PopupItem.cpp
- src/popups/ReplyPopup.cpp
- src/popups/UserMentions.cpp
- src/TextInputWidget.cpp
- src/TopRoomBar.cpp
- src/TrayIcon.cpp
- src/Utils.cpp
- src/UserInfoWidget.cpp
- src/UserSettingsPage.cpp
- src/WelcomePage.cpp
- src/main.cpp
-)
+ src/AvatarProvider.cpp
+ src/Cache.cpp
+ src/ChatPage.cpp
+ src/CommunitiesListItem.cpp
+ src/CommunitiesList.cpp
+ src/EventAccessors.cpp
+ src/InviteeItem.cpp
+ src/LoginPage.cpp
+ src/Logging.cpp
+ src/MainWindow.cpp
+ src/MatrixClient.cpp
+ src/MxcImageProvider.cpp
+ src/ColorImageProvider.cpp
+ src/QuickSwitcher.cpp
+ src/Olm.cpp
+ src/RegisterPage.cpp
+ src/RoomInfoListItem.cpp
+ src/RoomList.cpp
+ src/RunGuard.cpp
+ src/SideBarActions.cpp
+ src/Splitter.cpp
+ src/popups/SuggestionsPopup.cpp
+ src/popups/PopupItem.cpp
+ src/popups/ReplyPopup.cpp
+ src/popups/UserMentions.cpp
+ src/TextInputWidget.cpp
+ src/TopRoomBar.cpp
+ src/TrayIcon.cpp
+ src/Utils.cpp
+ src/UserInfoWidget.cpp
+ src/UserSettingsPage.cpp
+ src/WelcomePage.cpp
+ src/main.cpp
+ )
-# ExternalProject dependencies
-set(EXTERNAL_PROJECT_DEPS "")
include(FeatureSummary)
-set(Boost_USE_STATIC_LIBS OFF)
-set(Boost_USE_STATIC_RUNTIME OFF)
-set(Boost_USE_MULTITHREADED ON)
+if(USE_BUNDLED_BOOST)
+ hunter_add_package(Boost COMPONENTS iostreams system thread)
+endif()
find_package(Boost 1.70 REQUIRED
- COMPONENTS atomic
- chrono
- date_time
- iostreams
- random
- regex
- system
- thread)
+ COMPONENTS iostreams
+ system
+ thread)
+if(USE_BUNDLED_ZLIB)
+ hunter_add_package(ZLIB)
+endif()
find_package(ZLIB REQUIRED)
+if(USE_BUNDLED_OPENSSL)
+ hunter_add_package(OpenSSL)
+endif()
find_package(OpenSSL REQUIRED)
-find_package(MatrixClient 0.3.0 REQUIRED)
-find_package(Olm 2 REQUIRED)
+if(USE_BUNDLED_MTXCLIENT)
+ include(FetchContent)
+ set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
+ set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")
+ FetchContent_Declare(
+ MatrixClient
+ GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
+ GIT_TAG 1fd59de2a37e6b547db8e5b52114f3f10171ef2f
+ )
+ FetchContent_MakeAvailable(MatrixClient)
+else()
+ find_package(MatrixClient 0.3.0 REQUIRED)
+endif()
+if(USE_BUNDLED_OLM)
+ include(FetchContent)
+ set(OLM_TESTS OFF CACHE INTERNAL "")
+ FetchContent_Declare(
+ Olm
+ GIT_REPOSITORY https://gitlab.matrix.org/matrix-org/olm.git
+ GIT_TAG 3.1.4
+ )
+ FetchContent_MakeAvailable(Olm)
+else()
+ find_package(Olm 3)
+ set_package_properties(Olm PROPERTIES
+ DESCRIPTION "An implementation of the Double Ratchet cryptographic ratchet"
+ URL "https://git.matrix.org/git/olm/about/"
+ TYPE REQUIRED
+ )
+endif()
+if(USE_BUNDLED_SPDLOG)
+ hunter_add_package(spdlog)
+endif()
find_package(spdlog 1.0.0 CONFIG REQUIRED)
-find_package(cmark REQUIRED)
-find_package(nlohmann_json 3.2.0)
-set_package_properties(nlohmann_json PROPERTIES
- DESCRIPTION "JSON for Modern C++, a C++11 header-only JSON class"
- URL "https://nlohmann.github.io/json/"
- TYPE REQUIRED
-)
-if(NOT LMDBXX_INCLUDE_DIR)
- find_path(LMDBXX_INCLUDE_DIR
- NAMES lmdb++.h
- PATHS /usr/include
- /usr/local/include
- $ENV{LIB_DIR}/include
- $ENV{LIB_DIR}/include/lmdbxx)
+if(USE_BUNDLED_CMARK)
+ include(FetchContent)
+ FetchContent_Declare(
+ cmark
+ GIT_REPOSITORY https://github.com/commonmark/cmark.git
+ GIT_TAG 242e277a661ec7e51f34dcaf86c1925d550b1498 #0.29.0 << doesn't work with fetch content yet
+ CMAKE_ARGS "CMARK_STATIC=ON CMARK_SHARED=OFF CMARK_TESTS=OFF CMARK_TESTS=OFF"
+ )
+ FetchContent_MakeAvailable(cmark)
+ if (MSVC)
+ add_library(cmark::cmark ALIAS libcmark)
+ else()
+ add_library(cmark::cmark ALIAS libcmark_static)
+ endif()
+else()
+ find_package(cmark REQUIRED)
endif()
-include_directories(SYSTEM ${LMDBXX_INCLUDE_DIR})
-if(NOT TWEENY_INCLUDE_DIR)
- find_path(TWEENY_INCLUDE_DIR
- NAMES tweeny/tweeny.h
- PATHS /usr/include/
- /usr/local/include/
- $ENV{LIB_DIR}/include/
- $ENV{LIB_DIR}/include/tweeny)
+if(USE_BUNDLED_JSON)
+ hunter_add_package(nlohmann_json)
endif()
-include_directories(SYSTEM ${TWEENY_INCLUDE_DIR})
+find_package(nlohmann_json 3.2.0)
+set_package_properties(nlohmann_json PROPERTIES
+ DESCRIPTION "JSON for Modern C++, a C++11 header-only JSON class"
+ URL "https://nlohmann.github.io/json/"
+ TYPE REQUIRED
+ )
+
+if(USE_BUNDLED_LMDBXX)
+ hunter_add_package(lmdbxx)
+ find_package(lmdbxx CONFIG REQUIRED)
+else()
+ if(NOT LMDBXX_INCLUDE_DIR)
+ find_path(LMDBXX_INCLUDE_DIR
+ NAMES lmdb++.h
+ PATHS /usr/include
+ /usr/local/include
+ $ENV{LIB_DIR}/include
+ $ENV{LIB_DIR}/include/lmdbxx)
-include_directories(${CMAKE_SOURCE_DIR}/src)
-include_directories(${Boost_INCLUDE_DIRS})
+ endif()
+ add_library(lmdbxx INTERFACE)
+ target_include_directories(lmdbxx INTERFACE ${LMDBXX_INCLUDE_DIR})
+ add_library(lmdbxx::lmdbxx ALIAS lmdbxx)
+endif()
-# local inclue directory
-include_directories(includes)
+if(USE_BUNDLED_TWEENY)
+ include(FetchContent)
+ FetchContent_Declare(
+ Tweeny
+ GIT_REPOSITORY https://github.com/mobius3/tweeny.git
+ GIT_TAG 6a5033372fe53c4c731c66c8a2d56261746cd85c #v3 <- v3 has unfixed warnings
+ )
+ FetchContent_MakeAvailable(Tweeny)
+else()
+ find_package(Tweeny REQUIRED)
+endif()
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
qt5_wrap_cpp(MOC_HEADERS
- # Dialogs
- src/dialogs/CreateRoom.h
- src/dialogs/ImageOverlay.h
- src/dialogs/PreviewUploadOverlay.h
- src/dialogs/InviteUsers.h
- src/dialogs/JoinRoom.h
- src/dialogs/MemberList.h
- src/dialogs/LeaveRoom.h
- src/dialogs/Logout.h
- src/dialogs/UserProfile.h
- src/dialogs/RawMessage.h
- src/dialogs/ReadReceipts.h
- src/dialogs/ReCaptcha.h
- src/dialogs/RoomSettings.h
+ # Dialogs
+ src/dialogs/CreateRoom.h
+ src/dialogs/ImageOverlay.h
+ src/dialogs/PreviewUploadOverlay.h
+ src/dialogs/InviteUsers.h
+ src/dialogs/JoinRoom.h
+ src/dialogs/MemberList.h
+ src/dialogs/LeaveRoom.h
+ src/dialogs/Logout.h
+ src/dialogs/UserProfile.h
+ src/dialogs/RawMessage.h
+ src/dialogs/ReadReceipts.h
+ src/dialogs/ReCaptcha.h
+ src/dialogs/RoomSettings.h
- # Emoji
- src/emoji/Category.h
- src/emoji/ItemDelegate.h
- src/emoji/Panel.h
- src/emoji/PickButton.h
+ # Emoji
+ src/emoji/Category.h
+ src/emoji/ItemDelegate.h
+ src/emoji/Panel.h
+ src/emoji/PickButton.h
- # Timeline
- src/timeline/TimelineViewManager.h
- src/timeline/TimelineModel.h
- src/timeline/DelegateChooser.h
+ # Timeline
+ src/timeline/TimelineViewManager.h
+ src/timeline/TimelineModel.h
+ src/timeline/DelegateChooser.h
- # UI components
- src/ui/Avatar.h
- src/ui/Badge.h
- src/ui/LoadingIndicator.h
- src/ui/InfoMessage.h
- src/ui/FlatButton.h
- src/ui/Label.h
- src/ui/FloatingButton.h
- src/ui/Menu.h
- src/ui/OverlayWidget.h
- src/ui/SnackBar.h
- src/ui/RaisedButton.h
- src/ui/Ripple.h
- src/ui/RippleOverlay.h
- src/ui/TextField.h
- src/ui/TextLabel.h
- src/ui/ToggleButton.h
- src/ui/Theme.h
- src/ui/ThemeManager.h
+ # UI components
+ src/ui/Avatar.h
+ src/ui/Badge.h
+ src/ui/LoadingIndicator.h
+ src/ui/InfoMessage.h
+ src/ui/FlatButton.h
+ src/ui/Label.h
+ src/ui/FloatingButton.h
+ src/ui/Menu.h
+ src/ui/OverlayWidget.h
+ src/ui/SnackBar.h
+ src/ui/RaisedButton.h
+ src/ui/Ripple.h
+ src/ui/RippleOverlay.h
+ src/ui/TextField.h
+ src/ui/TextLabel.h
+ src/ui/ToggleButton.h
+ src/ui/Theme.h
+ src/ui/ThemeManager.h
- src/notifications/Manager.h
+ src/notifications/Manager.h
- src/AvatarProvider.h
- src/Cache_p.h
- src/ChatPage.h
- src/CommunitiesListItem.h
- src/CommunitiesList.h
- src/LoginPage.h
- src/MainWindow.h
- src/MxcImageProvider.h
- src/InviteeItem.h
- src/QuickSwitcher.h
- src/RegisterPage.h
- src/RoomInfoListItem.h
- src/RoomList.h
- src/SideBarActions.h
- src/Splitter.h
- src/popups/SuggestionsPopup.h
- src/popups/ReplyPopup.h
- src/popups/PopupItem.h
- src/popups/UserMentions.h
- src/TextInputWidget.h
- src/TopRoomBar.h
- src/TrayIcon.h
- src/UserInfoWidget.h
- src/UserSettingsPage.h
- src/WelcomePage.h
-)
+ src/AvatarProvider.h
+ src/Cache_p.h
+ src/ChatPage.h
+ src/CommunitiesListItem.h
+ src/CommunitiesList.h
+ src/LoginPage.h
+ src/MainWindow.h
+ src/MxcImageProvider.h
+ src/InviteeItem.h
+ src/QuickSwitcher.h
+ src/RegisterPage.h
+ src/RoomInfoListItem.h
+ src/RoomList.h
+ src/SideBarActions.h
+ src/Splitter.h
+ src/popups/SuggestionsPopup.h
+ src/popups/ReplyPopup.h
+ src/popups/PopupItem.h
+ src/popups/UserMentions.h
+ src/TextInputWidget.h
+ src/TopRoomBar.h
+ src/TrayIcon.h
+ src/UserInfoWidget.h
+ src/UserSettingsPage.h
+ src/WelcomePage.h
+ )
#
# Bundle translations.
@@ -389,96 +503,106 @@ qt5_wrap_cpp(MOC_HEADERS
include(Translations)
set(TRANSLATION_DEPS ${LANG_QRC} ${QRC} ${QM_SRC})
-set(COMMON_LIBS
- MatrixClient::MatrixClient
- ${Boost_LIBRARIES}
- cmark::cmark
- Qt5::Widgets
- Qt5::Svg
- Qt5::Concurrent
- Qt5::Multimedia
- Qt5::Qml
- Qt5::QuickControls2
- Qt5::QuickWidgets
- nlohmann_json::nlohmann_json
- spdlog::spdlog)
-
-if(APPVEYOR_BUILD)
- set(NHEKO_LIBS ${COMMON_LIBS} lmdb)
-else()
- set(NHEKO_LIBS ${COMMON_LIBS} ${LMDB_LIBRARY})
-endif()
-
if (APPLE)
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Foundation -framework Cocoa")
- set(SRC_FILES ${SRC_FILES} src/notifications/ManagerMac.mm src/emoji/MacHelper.mm)
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Foundation -framework Cocoa")
+ set(SRC_FILES ${SRC_FILES} src/notifications/ManagerMac.mm src/emoji/MacHelper.mm)
elseif (WIN32)
- file(DOWNLOAD
- "https://raw.githubusercontent.com/mohabouje/WinToast/41ed1c58d5dce0ee9c01dbdeac05be45358d4f57/src/wintoastlib.cpp"
- ${PROJECT_SOURCE_DIR}/src/wintoastlib.cpp
- EXPECTED_HASH SHA256=1A1A7CE41C1052B12946798F4A6C67CE1FAD209C967F5ED4D720B173527E2073)
+ file(DOWNLOAD
+ "https://raw.githubusercontent.com/mohabouje/WinToast/41ed1c58d5dce0ee9c01dbdeac05be45358d4f57/src/wintoastlib.cpp"
+ ${PROJECT_SOURCE_DIR}/src/wintoastlib.cpp
+ EXPECTED_HASH SHA256=1A1A7CE41C1052B12946798F4A6C67CE1FAD209C967F5ED4D720B173527E2073)
- file(DOWNLOAD
- "https://raw.githubusercontent.com/mohabouje/WinToast/41ed1c58d5dce0ee9c01dbdeac05be45358d4f57/src/wintoastlib.h"
- ${PROJECT_SOURCE_DIR}/src/wintoastlib.h
- EXPECTED_HASH SHA256=b4481023c5782733795838be22bf1a75f45d87458cd4d9a5a75f664a146eea11)
+ file(DOWNLOAD
+ "https://raw.githubusercontent.com/mohabouje/WinToast/41ed1c58d5dce0ee9c01dbdeac05be45358d4f57/src/wintoastlib.h"
+ ${PROJECT_SOURCE_DIR}/src/wintoastlib.h
+ EXPECTED_HASH SHA256=b4481023c5782733795838be22bf1a75f45d87458cd4d9a5a75f664a146eea11)
- set(SRC_FILES ${SRC_FILES} src/notifications/ManagerWin.cpp src/wintoastlib.cpp)
+ set(SRC_FILES ${SRC_FILES} src/notifications/ManagerWin.cpp src/wintoastlib.cpp)
else ()
- set(SRC_FILES ${SRC_FILES} src/notifications/ManagerLinux.cpp)
+ set(SRC_FILES ${SRC_FILES} src/notifications/ManagerLinux.cpp)
endif ()
set(NHEKO_DEPS
- ${SRC_FILES}
- ${UI_HEADERS}
- ${MOC_HEADERS}
- ${TRANSLATION_DEPS}
- ${META_FILES_TO_INCLUDE})
+ ${SRC_FILES}
+ ${UI_HEADERS}
+ ${MOC_HEADERS}
+ ${TRANSLATION_DEPS}
+ ${META_FILES_TO_INCLUDE})
if(ASAN)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address,undefined")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address,undefined")
endif()
+add_executable (nheko ${OS_BUNDLE} ${NHEKO_DEPS})
if(APPLE)
- add_executable (nheko ${OS_BUNDLE} ${NHEKO_DEPS})
- target_link_libraries (nheko ${NHEKO_LIBS} Qt5::MacExtras)
+ target_link_libraries (nheko PRIVATE Qt5::MacExtras)
elseif(WIN32)
- add_executable (nheko ${OS_BUNDLE} ${ICON_FILE} ${NHEKO_DEPS})
- target_compile_definitions(nheko PRIVATE WIN32_LEAN_AND_MEAN)
- target_link_libraries (nheko ${NTDLIB} ${NHEKO_LIBS} Qt5::WinMain)
+ target_compile_definitions(nheko PRIVATE WIN32_LEAN_AND_MEAN)
+ target_link_libraries (nheko PRIVATE ${NTDLIB} Qt5::WinMain)
else()
- add_executable (nheko ${OS_BUNDLE} ${NHEKO_DEPS})
- target_link_libraries (nheko ${NHEKO_LIBS} Qt5::DBus)
+ target_link_libraries (nheko PRIVATE Qt5::DBus)
endif()
+target_include_directories(nheko PRIVATE src includes)
+
+target_link_libraries(nheko PRIVATE
+ MatrixClient::MatrixClient
+ Boost::iostreams
+ Boost::system
+ Boost::thread
+ cmark::cmark
+ spdlog::spdlog
+ Qt5::Widgets
+ Qt5::Svg
+ Qt5::Concurrent
+ Qt5::Multimedia
+ Qt5::Qml
+ Qt5::QuickControls2
+ Qt5::QuickWidgets
+ nlohmann_json::nlohmann_json
+ lmdbxx::lmdbxx
+ tweeny)
+
+if(USE_BUNDLED_LMDB)
+ target_link_libraries(nheko PRIVATE liblmdb::lmdb)
+ if(MSVC)
+ target_link_libraries(nheko PRIVATE ntdll)
+ endif()
+else()
+ target_link_libraries(nheko PRIVATE PkgConfig::lmdb)
+endif()
+
if(QML_DEBUGGING)
target_compile_definitions(nheko PRIVATE QML_DEBUGGING)
endif()
-if(EXTERNAL_PROJECT_DEPS)
- add_dependencies(nheko ${EXTERNAL_PROJECT_DEPS})
+
+if(NOT MSVC)
+ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR CI_BUILD)
+ target_compile_options(nheko PRIVATE "-Werror")
+ endif()
endif()
set_target_properties(nheko PROPERTIES SKIP_BUILD_RPATH TRUE)
if(UNIX AND NOT APPLE)
- install (TARGETS nheko RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
- install (FILES "resources/nheko-16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps" RENAME "nheko.png")
- install (FILES "resources/nheko-32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps" RENAME "nheko.png")
- install (FILES "resources/nheko-48.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps" RENAME "nheko.png")
- install (FILES "resources/nheko-64.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps" RENAME "nheko.png")
- install (FILES "resources/nheko-128.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps" RENAME "nheko.png")
- install (FILES "resources/nheko-256.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps" RENAME "nheko.png")
- install (FILES "resources/nheko-512.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/512x512/apps" RENAME "nheko.png")
- install (FILES "resources/nheko.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
- install (FILES "resources/nheko.appdata.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo")
+ install (TARGETS nheko RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+ install (FILES "resources/nheko-16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps" RENAME "nheko.png")
+ install (FILES "resources/nheko-32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps" RENAME "nheko.png")
+ install (FILES "resources/nheko-48.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps" RENAME "nheko.png")
+ install (FILES "resources/nheko-64.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps" RENAME "nheko.png")
+ install (FILES "resources/nheko-128.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps" RENAME "nheko.png")
+ install (FILES "resources/nheko-256.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps" RENAME "nheko.png")
+ install (FILES "resources/nheko-512.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/512x512/apps" RENAME "nheko.png")
+ install (FILES "resources/nheko.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
+ install (FILES "resources/nheko.appdata.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo")
- if(NOT TARGET uninstall)
- configure_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
- IMMEDIATE @ONLY)
- add_custom_target(uninstall
- COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
- endif()
+ if(NOT TARGET uninstall)
+ configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+ IMMEDIATE @ONLY)
+ add_custom_target(uninstall
+ COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+ endif()
endif()
diff --git a/README.md b/README.md
index 5df85374..7c06daeb 100644
--- a/README.md
+++ b/README.md
@@ -19,18 +19,20 @@ Help us with translations so as many people as possible will be able to use nhek
### Note regarding End-to-End encryption
Currently the implementation is at best a **proof of concept** and it should only be used for
-testing purposes.
+testing purposes. Most importantly, it is missing device verification, so while your messages
+and media are encrypted, nheko doesn't verify who gets the messages.
## Features
Most of the features you would expect from a chat application are missing right now
but we are getting close to a more feature complete client.
Specifically there is support for:
-- E2E encryption (text messages only: attachments are currently sent unencrypted).
+- E2E encryption.
- User registration.
- Creating, joining & leaving rooms.
- Sending & receiving invites.
- Sending & receiving files and emoji (inline widgets for images, audio and file messages).
+- Replies with text, images and other media (and actually render them as inline widgets).
- Typing notifications.
- Username auto-completion.
- Message & mention notifications.
@@ -61,7 +63,7 @@ sudo dnf install nheko
#### Gentoo Linux
```bash
-sudo layman -a matrix
+sudo eselect repository enable matrix
sudo emerge -a nheko
```
@@ -105,6 +107,27 @@ sudo port install nheko
- GCC 7 (tested on Travis CI)
- MSVC 19.13 (tested on AppVeyor)
+Nheko can use bundled version for most of those libraries automatically, if the versions in your distro are too old.
+To use them, you can enable the hunter integration by passing `-DHUNTER_ENABLED=ON`.
+It is probably wise to link those dependencies statically by passing `-DBUILD_SHARED_LIBS=OFF`
+You can select which bundled dependencies you want to use py passing various `-DUSE_BUNDLED_*` flags. By default all dependencies are bundled *if* you enable hunter.
+
+The bundle flags are currently:
+
+- USE_BUNDLED_BOOST
+- USE_BUNDLED_SPDLOG
+- USE_BUNDLED_OLM
+- USE_BUNDLED_GTEST
+- USE_BUNDLED_CMARK
+- USE_BUNDLED_JSON
+- USE_BUNDLED_OPENSSL
+- USE_BUNDLED_MTXCLIENT
+- USE_BUNDLED_SODIUM
+- USE_BUNDLED_ZLIB
+- USE_BUNDLED_LMDB
+- USE_BUNDLED_LMDBXX
+- USE_BUNDLED_TWEENY
+
#### Linux
If you don't want to install any external dependencies, you can generate an AppImage locally using docker.
@@ -145,6 +168,17 @@ sudo apt-get update
sudo apt-get install -y g++-7 qt59base qt59svg qt59tools qt59multimedia cmake liblmdb-dev libsodium-dev
```
+##### Debian Buster (or higher probably)
+
+(User report, not sure if all of those are needed)
+
+```bash
+sudo apt install cmake gcc make automake liblmdb-dev libsodium-dev \
+ qt5-default libssl-dev libqt5multimedia5-plugins libqt5multimediagsttools5 libqt5multimediaquick5 libqt5svg5-dev \
+ qml-module-qtgstreamer qtmultimedia5-dev qtquickcontrols2-5-dev qttools5-dev qttools5-dev-tools \
+ qml-module-qtgraphicaleffects qml-module-qtmultimedia qml-module-qtquick-controls2 qml-module-qtquick-layouts
+```
+
##### macOS (Xcode 10.2 or later)
```bash
@@ -158,61 +192,29 @@ brew install qt5 lmdb cmake llvm libsodium spdlog boost cmark
(for the CMake integration) workloads.
2. Download the latest Qt for windows installer and install it somewhere.
-Make sure to install the `MSVC 2017 64-bit` toolset for at least Qt 5.9
+Make sure to install the `MSVC 2017 64-bit` toolset for at least Qt 5.10
(lower versions does not support VS2017).
-3. Install dependencies with `vcpkg`. You can simply clone it into a subfolder
-of the root nheko source directory.
-
-```powershell
-git clone http:\\github.com\Microsoft\vcpkg
-cd vcpkg
-.\bootstrap-vcpkg.bat
-.\vcpkg install --triplet x64-windows \
- boost-asio \
- boost-beast \
- boost-iostreams \
- boost-random \
- boost-signals2 \
- boost-system \
- boost-thread \
- cmark \
- libsodium \
- lmdb \
- openssl \
- zlib
-```
-
-4. Install dependencies not managed by vcpkg. (libolm, libmtxclient, libmatrix_structs)
-
-Inside the project root run the following (replacing the path to vcpkg as necessary).
-
-```bash
-cmake -G "Visual Studio 15 2017 Win64" -Hdeps -B.deps
- -DCMAKE_TOOLCHAIN_FILE=C:/Users/<your-path>/vcpkg/scripts/buildsystems/vcpkg.cmake
- -DUSE_BUNDLED_BOOST=OFF
-cmake --build .deps --config Release
-cmake --build .deps --config Debug
-```
+3. If you don't have openssl installed, you will need to install perl to build it (i.e. Strawberry Perl).
### Building
-First we need to install the rest of the dependencies that are not available in our system
+We can now build nheko:
```bash
-cmake -Hdeps -B.deps \
- -DUSE_BUNDLED_BOOST=OFF # if we already have boost & spdlog installed.
- -DUSE_BUNDLED_SPDLOG=OFF
-cmake --build .deps
+cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release
+cmake --build build
```
-We can now build nheko by pointing it to the path that we installed the dependencies.
+To use bundled dependencies you can use hunter, i.e.:
```bash
-cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.deps/usr
-cmake --build build
+cmake -H. -Bbuild -DHUNTER_ENABLED=ON -DCMAKE_BUILD_TYPE=OFF -DUSE_BUNDLED_OPENSSL=OFF
+cmake --build build --config Release
```
+Adapt the USE_BUNDLED_* as needed.
+
If the build fails with the following error
```
Could not find a package configuration file provided by "Qt5Widgets" with
@@ -237,13 +239,14 @@ The `nheko` binary will be located in the `build` directory.
After installing all dependencies, you need to edit the `CMakeSettings.json` to
be able to load and compile nheko within Visual Studio.
-You need to fill out the paths for the `CMAKE_TOOLCHAIN_FILE` and the `Qt5_DIR`.
-The toolchain file should point to the `vcpkg.cmake` and the Qt5 dir to the `lib\cmake\Qt5` dir.
+You need to fill out the paths for the `Qt5_DIR`.
+The Qt5 dir should point to the `lib\cmake\Qt5` dir.
Examples for the paths are:
- - `C:\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake`
- `C:\\Qt\\5.10.1\\msvc2017_64\\lib\\cmake\\Qt5`
+You should also enable hunter by setting `HUNTER_ENABLED` to `ON` and `BUILD_SHARED_LIBS` to `OFF`.
+
Now right click into the root nheko source directory and choose `Open in Visual Studio`.
You can choose the build type Release and Debug in the top toolbar.
After a successful CMake generation you can select the `nheko.exe` as the run target.
@@ -261,6 +264,9 @@ windeployqt nheko.exe
The final binary will be located inside `build-vc\Release\Release` for the Release build
and `build-vc\Debug\Debug` for the Debug build.
+Also copy the respective cmark.dll to the binary dir from `build/cmark-build/src/Release` (or Debug).
+
+
### Contributing
See [CONTRIBUTING](.github/CONTRIBUTING.md)
diff --git a/appveyor.yml b/appveyor.yml
index 8228a910..78b57139 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,9 +1,9 @@
---
-version: 0.6.4-{build}
+version: 0.7.0-{build}
configuration: Release
-image: Visual Studio 2019
+image: Visual Studio 2017
platform: x64
environment:
@@ -11,32 +11,16 @@ environment:
secure: "iGl5mzE9/ta9kFELUxDw9XtlYMSCMai9xowXIkYzU8WKHz7NfW0mLwMJZvblZFXJ"
cache:
- - c:\tools\vcpkg\installed\ -> appveyor.yml
-# - .deps -> appveyor.yml,deps\CMakeLists.txt <- disabled because it randomly seems to break everytime
+ - c:\hunter\ -> appveyor.yml
+ - build\_deps -> appveyor.yml,deps\CMakeLists.txt
build:
verbosity: minimal
install:
- - set QT_DIR=C:\Qt\5.14\msvc2017_64
- - set PATH=%PATH%;%QT_DIR%\bin;C:\MinGW\bin
- - set PATH=%PATH%;C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev1\mingw64\bin
- - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
- - cd "C:\Tools\vcpkg"&& git pull && .\bootstrap-vcpkg.bat && cd %APPVEYOR_BUILD_FOLDER%
- - vcpkg install
- nlohmann-json:%PLATFORM%-windows
- boost-asio:%PLATFORM%-windows
- boost-beast:%PLATFORM%-windows
- boost-iostreams:%PLATFORM%-windows
- boost-random:%PLATFORM%-windows
- boost-signals2:%PLATFORM%-windows
- boost-system:%PLATFORM%-windows
- boost-thread:%PLATFORM%-windows
- libsodium:%PLATFORM%-windows
- lmdb:%PLATFORM%-windows
- openssl:%PLATFORM%-windows
- zlib:%PLATFORM%-windows
- - vcpkg upgrade --no-dry-run
+ - set QT_DIR=C:\Qt\5.13\msvc2017_64
+ - set PATH=%PATH%;%QT_DIR%\bin
+ - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
build_script:
# VERSION format: branch-master/branch-1.2
@@ -57,23 +41,13 @@ build_script:
- echo %INSTVERSION%
- echo %DATE%
- # Build & install the dependencies
- - cmake -G "Visual Studio 16 2019" -A x64 -Hdeps -B.deps
- -DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake
- -DUSE_BUNDLED_BOOST=OFF
- -DUSE_BUNDLED_JSON=OFF
- -DMTX_STATIC=ON
- - cmake --build .deps --config Release
-
# Build nheko
- - rm -f cmake/FindOlm.cmake
- - cmake -G "Visual Studio 16 2019" -A x64 -H. -Bbuild
- -DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake
- -DLMDBXX_INCLUDE_DIR=.deps/usr/include
- -DTWEENY_INCLUDE_DIR=.deps/usr/include
- -DCMARK_INCLUDE_DIR=C:/projects/nheko/.deps/usr/include
- -DCMARK_LIBRARY=C:/projects/nheko/.deps/usr/lib/cmark.lib
- -DJSON_INCLUDE_DIR=.deps/usr/include
+ #- cmake -G "Visual Studio 16 2019" -A x64 -H. -Bbuild
+ - cmake -G "Visual Studio 15 2017 Win64" -H. -Bbuild
+ -DHUNTER_ROOT="C:\hunter"
+ -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF
+ -DCMAKE_BUILD_TYPE=Release -DHUNTER_CONFIGURATION_TYPES=Release
+
- cmake --build build --config Release
after_build:
@@ -82,12 +56,9 @@ after_build:
- echo %BUILD%
- mkdir NhekoRelease
- copy build\Release\nheko.exe NhekoRelease\nheko.exe
+ - copy build\_deps\cmark-build\src\Release\cmark.dll NhekoRelease\cmark.dll
- windeployqt --qmldir %QT_DIR%\qml\ --release NhekoRelease\nheko.exe
- - copy C:\Tools\vcpkg\installed\x64-windows\bin\*.dll .\NhekoRelease\
-
- - copy C:\projects\nheko\.deps\usr\bin\cmark.dll .\NhekoRelease\
-
- 7z a nheko_win_64.zip .\NhekoRelease\*
- ls -lh build\Release\
- ls -lh NhekoRelease\
diff --git a/cmake/FindOlm.cmake b/cmake/FindOlm.cmake
deleted file mode 100644
index da68dbf5..00000000
--- a/cmake/FindOlm.cmake
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# CMake module to search for the olm library
-#
-# On success, the macro sets the following variables:
-# OLM_FOUND = if the library found
-# OLM_LIBRARY = full path to the library
-# OLM_INCLUDE_DIR = where to find the library headers
-#
-if(WIN32)
- message(STATUS "FindOlm is not supported in Windows")
- return()
-endif()
-
-find_path(OLM_INCLUDE_DIR
- NAMES olm/olm.h
- PATHS /usr/include
- /usr/local/include
- $ENV{LIB_DIR}/include
- $ENV{LIB_DIR}/include/olm)
-
-find_library(OLM_LIBRARY
- NAMES olm
- PATHS /usr/lib /usr/local/lib $ENV{LIB_DIR}/lib)
-
-if(OLM_FOUND)
- set(OLM_INCLUDE_DIRS ${OLM_INCLUDE_DIR})
-
- if(NOT OLM_LIBRARIES)
- set(OLM_LIBRARIES ${OLM_LIBRARY})
- endif()
-endif()
-
-if(NOT TARGET Olm::Olm)
- add_library(Olm::Olm UNKNOWN IMPORTED)
- set_target_properties(Olm::Olm
- PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
- ${OLM_INCLUDE_DIR})
- set_property(TARGET Olm::Olm APPEND PROPERTY IMPORTED_LOCATION ${OLM_LIBRARY})
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(OLM DEFAULT_MSG OLM_INCLUDE_DIR OLM_LIBRARY)
-
-mark_as_advanced(OLM_LIBRARY OLM_INCLUDE_DIR)
diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake
new file mode 100644
index 00000000..d2f87774
--- /dev/null
+++ b/cmake/Hunter/config.cmake
@@ -0,0 +1,5 @@
+hunter_config(
+ Boost
+ VERSION "1.70.0-p0"
+ CMAKE_ARGS IOSTREAMS_NO_BZIP2=1
+)
diff --git a/cmake/HunterGate.cmake b/cmake/HunterGate.cmake
new file mode 100644
index 00000000..e78d3e89
--- /dev/null
+++ b/cmake/HunterGate.cmake
@@ -0,0 +1,528 @@
+# Copyright (c) 2013-2019, Ruslan Baratov
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# This is a gate file to Hunter package manager.
+# Include this file using `include` command and add package you need, example:
+#
+# cmake_minimum_required(VERSION 3.2)
+#
+# include("cmake/HunterGate.cmake")
+# HunterGate(
+# URL "https://github.com/path/to/hunter/archive.tar.gz"
+# SHA1 "798501e983f14b28b10cda16afa4de69eee1da1d"
+# )
+#
+# project(MyProject)
+#
+# hunter_add_package(Foo)
+# hunter_add_package(Boo COMPONENTS Bar Baz)
+#
+# Projects:
+# * https://github.com/hunter-packages/gate/
+# * https://github.com/ruslo/hunter
+
+option(HUNTER_ENABLED "Enable Hunter package manager support" ON)
+
+if(HUNTER_ENABLED)
+ if(CMAKE_VERSION VERSION_LESS "3.2")
+ message(
+ FATAL_ERROR
+ "At least CMake version 3.2 required for Hunter dependency management."
+ " Update CMake or set HUNTER_ENABLED to OFF."
+ )
+ endif()
+endif()
+
+include(CMakeParseArguments) # cmake_parse_arguments
+
+option(HUNTER_STATUS_PRINT "Print working status" ON)
+option(HUNTER_STATUS_DEBUG "Print a lot info" OFF)
+option(HUNTER_TLS_VERIFY "Enable/disable TLS certificate checking on downloads" ON)
+
+set(HUNTER_ERROR_PAGE "https://docs.hunter.sh/en/latest/reference/errors")
+
+function(hunter_gate_status_print)
+ if(HUNTER_STATUS_PRINT OR HUNTER_STATUS_DEBUG)
+ foreach(print_message ${ARGV})
+ message(STATUS "[hunter] ${print_message}")
+ endforeach()
+ endif()
+endfunction()
+
+function(hunter_gate_status_debug)
+ if(HUNTER_STATUS_DEBUG)
+ foreach(print_message ${ARGV})
+ string(TIMESTAMP timestamp)
+ message(STATUS "[hunter *** DEBUG *** ${timestamp}] ${print_message}")
+ endforeach()
+ endif()
+endfunction()
+
+function(hunter_gate_error_page error_page)
+ message("------------------------------ ERROR ------------------------------")
+ message(" ${HUNTER_ERROR_PAGE}/${error_page}.html")
+ message("-------------------------------------------------------------------")
+ message("")
+ message(FATAL_ERROR "")
+endfunction()
+
+function(hunter_gate_internal_error)
+ message("")
+ foreach(print_message ${ARGV})
+ message("[hunter ** INTERNAL **] ${print_message}")
+ endforeach()
+ message("[hunter ** INTERNAL **] [Directory:${CMAKE_CURRENT_LIST_DIR}]")
+ message("")
+ hunter_gate_error_page("error.internal")
+endfunction()
+
+function(hunter_gate_fatal_error)
+ cmake_parse_arguments(hunter "" "ERROR_PAGE" "" "${ARGV}")
+ if("${hunter_ERROR_PAGE}" STREQUAL "")
+ hunter_gate_internal_error("Expected ERROR_PAGE")
+ endif()
+ message("")
+ foreach(x ${hunter_UNPARSED_ARGUMENTS})
+ message("[hunter ** FATAL ERROR **] ${x}")
+ endforeach()
+ message("[hunter ** FATAL ERROR **] [Directory:${CMAKE_CURRENT_LIST_DIR}]")
+ message("")
+ hunter_gate_error_page("${hunter_ERROR_PAGE}")
+endfunction()
+
+function(hunter_gate_user_error)
+ hunter_gate_fatal_error(${ARGV} ERROR_PAGE "error.incorrect.input.data")
+endfunction()
+
+function(hunter_gate_self root version sha1 result)
+ string(COMPARE EQUAL "${root}" "" is_bad)
+ if(is_bad)
+ hunter_gate_internal_error("root is empty")
+ endif()
+
+ string(COMPARE EQUAL "${version}" "" is_bad)
+ if(is_bad)
+ hunter_gate_internal_error("version is empty")
+ endif()
+
+ string(COMPARE EQUAL "${sha1}" "" is_bad)
+ if(is_bad)
+ hunter_gate_internal_error("sha1 is empty")
+ endif()
+
+ string(SUBSTRING "${sha1}" 0 7 archive_id)
+
+ set(
+ hunter_self
+ "${root}/_Base/Download/Hunter/${version}/${archive_id}/Unpacked"
+ )
+
+ set("${result}" "${hunter_self}" PARENT_SCOPE)
+endfunction()
+
+# Set HUNTER_GATE_ROOT cmake variable to suitable value.
+function(hunter_gate_detect_root)
+ # Check CMake variable
+ string(COMPARE NOTEQUAL "${HUNTER_ROOT}" "" not_empty)
+ if(not_empty)
+ set(HUNTER_GATE_ROOT "${HUNTER_ROOT}" PARENT_SCOPE)
+ hunter_gate_status_debug("HUNTER_ROOT detected by cmake variable")
+ return()
+ endif()
+
+ # Check environment variable
+ string(COMPARE NOTEQUAL "$ENV{HUNTER_ROOT}" "" not_empty)
+ if(not_empty)
+ set(HUNTER_GATE_ROOT "$ENV{HUNTER_ROOT}" PARENT_SCOPE)
+ hunter_gate_status_debug("HUNTER_ROOT detected by environment variable")
+ return()
+ endif()
+
+ # Check HOME environment variable
+ string(COMPARE NOTEQUAL "$ENV{HOME}" "" result)
+ if(result)
+ set(HUNTER_GATE_ROOT "$ENV{HOME}/.hunter" PARENT_SCOPE)
+ hunter_gate_status_debug("HUNTER_ROOT set using HOME environment variable")
+ return()
+ endif()
+
+ # Check SYSTEMDRIVE and USERPROFILE environment variable (windows only)
+ if(WIN32)
+ string(COMPARE NOTEQUAL "$ENV{SYSTEMDRIVE}" "" result)
+ if(result)
+ set(HUNTER_GATE_ROOT "$ENV{SYSTEMDRIVE}/.hunter" PARENT_SCOPE)
+ hunter_gate_status_debug(
+ "HUNTER_ROOT set using SYSTEMDRIVE environment variable"
+ )
+ return()
+ endif()
+
+ string(COMPARE NOTEQUAL "$ENV{USERPROFILE}" "" result)
+ if(result)
+ set(HUNTER_GATE_ROOT "$ENV{USERPROFILE}/.hunter" PARENT_SCOPE)
+ hunter_gate_status_debug(
+ "HUNTER_ROOT set using USERPROFILE environment variable"
+ )
+ return()
+ endif()
+ endif()
+
+ hunter_gate_fatal_error(
+ "Can't detect HUNTER_ROOT"
+ ERROR_PAGE "error.detect.hunter.root"
+ )
+endfunction()
+
+function(hunter_gate_download dir)
+ string(
+ COMPARE
+ NOTEQUAL
+ "$ENV{HUNTER_DISABLE_AUTOINSTALL}"
+ ""
+ disable_autoinstall
+ )
+ if(disable_autoinstall AND NOT HUNTER_RUN_INSTALL)
+ hunter_gate_fatal_error(
+ "Hunter not found in '${dir}'"
+ "Set HUNTER_RUN_INSTALL=ON to auto-install it from '${HUNTER_GATE_URL}'"
+ "Settings:"
+ " HUNTER_ROOT: ${HUNTER_GATE_ROOT}"
+ " HUNTER_SHA1: ${HUNTER_GATE_SHA1}"
+ ERROR_PAGE "error.run.install"
+ )
+ endif()
+ string(COMPARE EQUAL "${dir}" "" is_bad)
+ if(is_bad)
+ hunter_gate_internal_error("Empty 'dir' argument")
+ endif()
+
+ string(COMPARE EQUAL "${HUNTER_GATE_SHA1}" "" is_bad)
+ if(is_bad)
+ hunter_gate_internal_error("HUNTER_GATE_SHA1 empty")
+ endif()
+
+ string(COMPARE EQUAL "${HUNTER_GATE_URL}" "" is_bad)
+ if(is_bad)
+ hunter_gate_internal_error("HUNTER_GATE_URL empty")
+ endif()
+
+ set(done_location "${dir}/DONE")
+ set(sha1_location "${dir}/SHA1")
+
+ set(build_dir "${dir}/Build")
+ set(cmakelists "${dir}/CMakeLists.txt")
+
+ hunter_gate_status_debug("Locking directory: ${dir}")
+ file(LOCK "${dir}" DIRECTORY GUARD FUNCTION)
+ hunter_gate_status_debug("Lock done")
+
+ if(EXISTS "${done_location}")
+ # while waiting for lock other instance can do all the job
+ hunter_gate_status_debug("File '${done_location}' found, skip install")
+ return()
+ endif()
+
+ file(REMOVE_RECURSE "${build_dir}")
+ file(REMOVE_RECURSE "${cmakelists}")
+
+ file(MAKE_DIRECTORY "${build_dir}") # check directory permissions
+
+ # Disabling languages speeds up a little bit, reduces noise in the output
+ # and avoids path too long windows error
+ file(
+ WRITE
+ "${cmakelists}"
+ "cmake_minimum_required(VERSION 3.2)\n"
+ "project(HunterDownload LANGUAGES NONE)\n"
+ "include(ExternalProject)\n"
+ "ExternalProject_Add(\n"
+ " Hunter\n"
+ " URL\n"
+ " \"${HUNTER_GATE_URL}\"\n"
+ " URL_HASH\n"
+ " SHA1=${HUNTER_GATE_SHA1}\n"
+ " DOWNLOAD_DIR\n"
+ " \"${dir}\"\n"
+ " TLS_VERIFY\n"
+ " ${HUNTER_TLS_VERIFY}\n"
+ " SOURCE_DIR\n"
+ " \"${dir}/Unpacked\"\n"
+ " CONFIGURE_COMMAND\n"
+ " \"\"\n"
+ " BUILD_COMMAND\n"
+ " \"\"\n"
+ " INSTALL_COMMAND\n"
+ " \"\"\n"
+ ")\n"
+ )
+
+ if(HUNTER_STATUS_DEBUG)
+ set(logging_params "")
+ else()
+ set(logging_params OUTPUT_QUIET)
+ endif()
+
+ hunter_gate_status_debug("Run generate")
+
+ # Need to add toolchain file too.
+ # Otherwise on Visual Studio + MDD this will fail with error:
+ # "Could not find an appropriate version of the Windows 10 SDK installed on this machine"
+ if(EXISTS "${CMAKE_TOOLCHAIN_FILE}")
+ get_filename_component(absolute_CMAKE_TOOLCHAIN_FILE "${CMAKE_TOOLCHAIN_FILE}" ABSOLUTE)
+ set(toolchain_arg "-DCMAKE_TOOLCHAIN_FILE=${absolute_CMAKE_TOOLCHAIN_FILE}")
+ else()
+ # 'toolchain_arg' can't be empty
+ set(toolchain_arg "-DCMAKE_TOOLCHAIN_FILE=")
+ endif()
+
+ string(COMPARE EQUAL "${CMAKE_MAKE_PROGRAM}" "" no_make)
+ if(no_make)
+ set(make_arg "")
+ else()
+ # Test case: remove Ninja from PATH but set it via CMAKE_MAKE_PROGRAM
+ set(make_arg "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}")
+ endif()
+
+ execute_process(
+ COMMAND
+ "${CMAKE_COMMAND}"
+ "-H${dir}"
+ "-B${build_dir}"
+ "-G${CMAKE_GENERATOR}"
+ "${toolchain_arg}"
+ ${make_arg}
+ WORKING_DIRECTORY "${dir}"
+ RESULT_VARIABLE download_result
+ ${logging_params}
+ )
+
+ if(NOT download_result EQUAL 0)
+ hunter_gate_internal_error(
+ "Configure project failed."
+ "To reproduce the error run: ${CMAKE_COMMAND} -H${dir} -B${build_dir} -G${CMAKE_GENERATOR} ${toolchain_arg} ${make_arg}"
+ "In directory ${dir}"
+ )
+ endif()
+
+ hunter_gate_status_print(
+ "Initializing Hunter workspace (${HUNTER_GATE_SHA1})"
+ " ${HUNTER_GATE_URL}"
+ " -> ${dir}"
+ )
+ execute_process(
+ COMMAND "${CMAKE_COMMAND}" --build "${build_dir}"
+ WORKING_DIRECTORY "${dir}"
+ RESULT_VARIABLE download_result
+ ${logging_params}
+ )
+
+ if(NOT download_result EQUAL 0)
+ hunter_gate_internal_error("Build project failed")
+ endif()
+
+ file(REMOVE_RECURSE "${build_dir}")
+ file(REMOVE_RECURSE "${cmakelists}")
+
+ file(WRITE "${sha1_location}" "${HUNTER_GATE_SHA1}")
+ file(WRITE "${done_location}" "DONE")
+
+ hunter_gate_status_debug("Finished")
+endfunction()
+
+# Must be a macro so master file 'cmake/Hunter' can
+# apply all variables easily just by 'include' command
+# (otherwise PARENT_SCOPE magic needed)
+macro(HunterGate)
+ if(HUNTER_GATE_DONE)
+ # variable HUNTER_GATE_DONE set explicitly for external project
+ # (see `hunter_download`)
+ set_property(GLOBAL PROPERTY HUNTER_GATE_DONE YES)
+ endif()
+
+ # First HunterGate command will init Hunter, others will be ignored
+ get_property(_hunter_gate_done GLOBAL PROPERTY HUNTER_GATE_DONE SET)
+
+ if(NOT HUNTER_ENABLED)
+ # Empty function to avoid error "unknown function"
+ function(hunter_add_package)
+ endfunction()
+
+ set(
+ _hunter_gate_disabled_mode_dir
+ "${CMAKE_CURRENT_LIST_DIR}/cmake/Hunter/disabled-mode"
+ )
+ if(EXISTS "${_hunter_gate_disabled_mode_dir}")
+ hunter_gate_status_debug(
+ "Adding \"disabled-mode\" modules: ${_hunter_gate_disabled_mode_dir}"
+ )
+ list(APPEND CMAKE_PREFIX_PATH "${_hunter_gate_disabled_mode_dir}")
+ endif()
+ elseif(_hunter_gate_done)
+ hunter_gate_status_debug("Secondary HunterGate (use old settings)")
+ hunter_gate_self(
+ "${HUNTER_CACHED_ROOT}"
+ "${HUNTER_VERSION}"
+ "${HUNTER_SHA1}"
+ _hunter_self
+ )
+ include("${_hunter_self}/cmake/Hunter")
+ else()
+ set(HUNTER_GATE_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}")
+
+ string(COMPARE NOTEQUAL "${PROJECT_NAME}" "" _have_project_name)
+ if(_have_project_name)
+ hunter_gate_fatal_error(
+ "Please set HunterGate *before* 'project' command. "
+ "Detected project: ${PROJECT_NAME}"
+ ERROR_PAGE "error.huntergate.before.project"
+ )
+ endif()
+
+ cmake_parse_arguments(
+ HUNTER_GATE "LOCAL" "URL;SHA1;GLOBAL;FILEPATH" "" ${ARGV}
+ )
+
+ string(COMPARE EQUAL "${HUNTER_GATE_SHA1}" "" _empty_sha1)
+ string(COMPARE EQUAL "${HUNTER_GATE_URL}" "" _empty_url)
+ string(
+ COMPARE
+ NOTEQUAL
+ "${HUNTER_GATE_UNPARSED_ARGUMENTS}"
+ ""
+ _have_unparsed
+ )
+ string(COMPARE NOTEQUAL "${HUNTER_GATE_GLOBAL}" "" _have_global)
+ string(COMPARE NOTEQUAL "${HUNTER_GATE_FILEPATH}" "" _have_filepath)
+
+ if(_have_unparsed)
+ hunter_gate_user_error(
+ "HunterGate unparsed arguments: ${HUNTER_GATE_UNPARSED_ARGUMENTS}"
+ )
+ endif()
+ if(_empty_sha1)
+ hunter_gate_user_error("SHA1 suboption of HunterGate is mandatory")
+ endif()
+ if(_empty_url)
+ hunter_gate_user_error("URL suboption of HunterGate is mandatory")
+ endif()
+ if(_have_global)
+ if(HUNTER_GATE_LOCAL)
+ hunter_gate_user_error("Unexpected LOCAL (already has GLOBAL)")
+ endif()
+ if(_have_filepath)
+ hunter_gate_user_error("Unexpected FILEPATH (already has GLOBAL)")
+ endif()
+ endif()
+ if(HUNTER_GATE_LOCAL)
+ if(_have_global)
+ hunter_gate_user_error("Unexpected GLOBAL (already has LOCAL)")
+ endif()
+ if(_have_filepath)
+ hunter_gate_user_error("Unexpected FILEPATH (already has LOCAL)")
+ endif()
+ endif()
+ if(_have_filepath)
+ if(_have_global)
+ hunter_gate_user_error("Unexpected GLOBAL (already has FILEPATH)")
+ endif()
+ if(HUNTER_GATE_LOCAL)
+ hunter_gate_user_error("Unexpected LOCAL (already has FILEPATH)")
+ endif()
+ endif()
+
+ hunter_gate_detect_root() # set HUNTER_GATE_ROOT
+
+ # Beautify path, fix probable problems with windows path slashes
+ get_filename_component(
+ HUNTER_GATE_ROOT "${HUNTER_GATE_ROOT}" ABSOLUTE
+ )
+ hunter_gate_status_debug("HUNTER_ROOT: ${HUNTER_GATE_ROOT}")
+ if(NOT HUNTER_ALLOW_SPACES_IN_PATH)
+ string(FIND "${HUNTER_GATE_ROOT}" " " _contain_spaces)
+ if(NOT _contain_spaces EQUAL -1)
+ hunter_gate_fatal_error(
+ "HUNTER_ROOT (${HUNTER_GATE_ROOT}) contains spaces."
+ "Set HUNTER_ALLOW_SPACES_IN_PATH=ON to skip this error"
+ "(Use at your own risk!)"
+ ERROR_PAGE "error.spaces.in.hunter.root"
+ )
+ endif()
+ endif()
+
+ string(
+ REGEX
+ MATCH
+ "[0-9]+\\.[0-9]+\\.[0-9]+[-_a-z0-9]*"
+ HUNTER_GATE_VERSION
+ "${HUNTER_GATE_URL}"
+ )
+ string(COMPARE EQUAL "${HUNTER_GATE_VERSION}" "" _is_empty)
+ if(_is_empty)
+ set(HUNTER_GATE_VERSION "unknown")
+ endif()
+
+ hunter_gate_self(
+ "${HUNTER_GATE_ROOT}"
+ "${HUNTER_GATE_VERSION}"
+ "${HUNTER_GATE_SHA1}"
+ _hunter_self
+ )
+
+ set(_master_location "${_hunter_self}/cmake/Hunter")
+ get_filename_component(_archive_id_location "${_hunter_self}/.." ABSOLUTE)
+ set(_done_location "${_archive_id_location}/DONE")
+ set(_sha1_location "${_archive_id_location}/SHA1")
+
+ # Check Hunter already downloaded by HunterGate
+ if(NOT EXISTS "${_done_location}")
+ hunter_gate_download("${_archive_id_location}")
+ endif()
+
+ if(NOT EXISTS "${_done_location}")
+ hunter_gate_internal_error("hunter_gate_download failed")
+ endif()
+
+ if(NOT EXISTS "${_sha1_location}")
+ hunter_gate_internal_error("${_sha1_location} not found")
+ endif()
+ file(READ "${_sha1_location}" _sha1_value)
+ string(COMPARE EQUAL "${_sha1_value}" "${HUNTER_GATE_SHA1}" _is_equal)
+ if(NOT _is_equal)
+ hunter_gate_internal_error(
+ "Short SHA1 collision:"
+ " ${_sha1_value} (from ${_sha1_location})"
+ " ${HUNTER_GATE_SHA1} (HunterGate)"
+ )
+ endif()
+ if(NOT EXISTS "${_master_location}")
+ hunter_gate_user_error(
+ "Master file not found:"
+ " ${_master_location}"
+ "try to update Hunter/HunterGate"
+ )
+ endif()
+ include("${_master_location}")
+ set_property(GLOBAL PROPERTY HUNTER_GATE_DONE YES)
+ endif()
+endmacro()
diff --git a/cmake/LMDB.cmake b/cmake/LMDB.cmake
deleted file mode 100644
index 2d8184de..00000000
--- a/cmake/LMDB.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Find the lmdb library & include dir.
-# Build lmdb on Appveyor.
-#
-
-if(APPVEYOR_BUILD)
- set(LMDB_VERSION "LMDB_0.9.21")
- set(NTDLIB "C:/WINDDK/7600.16385.1/lib/win7/amd64/ntdll.lib")
-
- execute_process(
- COMMAND git clone --depth=1 --branch ${LMDB_VERSION} https://github.com/LMDB/lmdb)
-
- set(LMDB_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/lmdb/libraries/liblmdb)
-
- add_library(lmdb
- ${CMAKE_SOURCE_DIR}/lmdb/libraries/liblmdb/lmdb.h
- ${CMAKE_SOURCE_DIR}/lmdb/libraries/liblmdb/mdb.c
- ${CMAKE_SOURCE_DIR}/lmdb/libraries/liblmdb/midl.h
- ${CMAKE_SOURCE_DIR}/lmdb/libraries/liblmdb/midl.c)
-
- set(LMDB_LIBRARY lmdb)
-else()
- find_path (LMDB_INCLUDE_DIR NAMES lmdb.h PATHS "$ENV{LMDB_DIR}/include")
- find_library (LMDB_LIBRARY NAMES lmdb PATHS "$ENV{LMDB_DIR}/lib" )
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(LMDB DEFAULT_MSG LMDB_INCLUDE_DIR LMDB_LIBRARY)
-endif()
-
-include_directories(${LMDB_INCLUDE_DIR})
diff --git a/src/Cache.h b/src/Cache.h
index da4e2040..a8991eb5 100644
--- a/src/Cache.h
+++ b/src/Cache.h
@@ -22,7 +22,11 @@
#include <QImage>
#include <QString>
+#if __has_include(<lmdbxx/lmdb++.h>)
+#include <lmdbxx/lmdb++.h>
+#else
#include <lmdb++.h>
+#endif
#include <mtx/responses.hpp>
diff --git a/src/Cache_p.h b/src/Cache_p.h
index 47dd945a..32f2a67d 100644
--- a/src/Cache_p.h
+++ b/src/Cache_p.h
@@ -26,7 +26,11 @@
#include <QImage>
#include <QString>
+#if __has_include(<lmdbxx/lmdb++.h>)
+#include <lmdbxx/lmdb++.h>
+#else
#include <lmdb++.h>
+#endif
#include <nlohmann/json.hpp>
#include <mtx/responses.hpp>
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index f66099a0..fb8c0095 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -1,6 +1,7 @@
#include "TimelineModel.h"
#include <algorithm>
+#include <thread>
#include <type_traits>
#include <QFileDialog>
diff --git a/src/ui/SnackBar.cpp b/src/ui/SnackBar.cpp
index 8a05d937..5daa697e 100644
--- a/src/ui/SnackBar.cpp
+++ b/src/ui/SnackBar.cpp
@@ -1,6 +1,6 @@
#include <QPainter>
-#include <tweeny/tweeny.h>
+#include <tweeny.h>
#include "SnackBar.h"
diff --git a/toolchain.cmake b/toolchain.cmake
new file mode 100644
index 00000000..85571957
--- /dev/null
+++ b/toolchain.cmake
@@ -0,0 +1,3 @@
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
