diff options
| author | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2018-09-01 13:35:10 +0300 |
|---|---|---|
| committer | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2018-09-01 13:35:10 +0300 |
| commit | 990a3a97c7578c30223ff4f348b9241be75f5bf9 (patch) | |
| tree | 392164db51daf80aac81bde90f35129dd338b972 /CMakeLists.txt | |
| parent | Remove nix script which was unmaintained (diff) | |
| download | nheko-990a3a97c7578c30223ff4f348b9241be75f5bf9.tar.xz | |
Merge matrix-structs into the client lib
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f2c987d..cb641cd5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,9 @@ option(ASAN "Compile with address sanitizers" OFF) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) +add_definitions(-DBOOST_MPL_LIMIT_LIST_SIZE=30) +add_definitions(-DBOOST_MPL_CFG_NO_PREPROCESSED_HEADERS) + include(GNUInstallDirs) # Include Qt basic functions @@ -230,9 +233,20 @@ set(SRC_FILES # ExternalProject dependencies set(EXTERNAL_PROJECT_DEPS "") +set(Boost_USE_STATIC_LIBS OFF) +set(Boost_USE_STATIC_RUNTIME OFF) +set(Boost_USE_MULTITHREADED ON) +find_package(Boost 1.66 REQUIRED + COMPONENTS atomic + chrono + date_time + iostreams + random + regex + system + thread) find_package(ZLIB REQUIRED) find_package(OpenSSL REQUIRED) -find_package(MatrixStructs 0.1.0 REQUIRED) find_package(MatrixClient 0.1.0 REQUIRED) find_package(Olm 2 REQUIRED) find_package(spdlog 1.0.0 CONFIG REQUIRED) @@ -259,6 +273,7 @@ include_directories(SYSTEM ${TWEENY_INCLUDE_DIR}) include_directories(${CMAKE_SOURCE_DIR}/src) include_directories(${CMAKE_CURRENT_BINARY_DIR}/config) +include_directories(${Boost_INCLUDE_DIRS}) qt5_wrap_cpp(MOC_HEADERS # Dialogs @@ -342,8 +357,8 @@ include(Translations) set(TRANSLATION_DEPS ${LANG_QRC} ${QRC} ${QM_SRC}) set(COMMON_LIBS - MatrixStructs::MatrixStructs MatrixClient::MatrixClient + ${Boost_LIBRARIES} Qt5::Widgets Qt5::Svg Qt5::Concurrent |