Merge branch 'e2ee'
- Support for e2ee rooms
- Implement categories & file logging
- Let the user know when the app can't reach the server (#93)
fixes #13
fixes #326
2 files changed, 0 insertions, 59 deletions
diff --git a/cmake/CompilerFlags.cmake b/cmake/CompilerFlags.cmake
deleted file mode 100644
index f5860a99..00000000
--- a/cmake/CompilerFlags.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
- -Wall \
- -Wextra \
- -Werror \
- -pipe \
- -Wno-unused-function \
- -pedantic \
- -Wunreachable-code")
-
- if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
- execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
-
- if (GCC_VERSION VERSION_GREATER 4.9)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always" )
- endif()
- endif()
-
- if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always" )
- endif()
-endif()
-
-if(NOT APPLE AND NOT MSVC)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
-endif()
diff --git a/cmake/MatrixStructs.cmake b/cmake/MatrixStructs.cmake
deleted file mode 100644
index af694c0f..00000000
--- a/cmake/MatrixStructs.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-include(ExternalProject)
-
-#
-# Build matrix-structs.
-#
-
-set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party)
-set(MATRIX_STRUCTS_ROOT ${THIRD_PARTY_ROOT}/matrix_structs)
-set(MATRIX_STRUCTS_INCLUDE_DIR ${MATRIX_STRUCTS_ROOT}/include)
-set(MATRIX_STRUCTS_LIBRARY matrix_structs)
-
-link_directories(${MATRIX_STRUCTS_ROOT})
-
-set(WINDOWS_FLAGS "")
-
-if(MSVC)
- set(WINDOWS_FLAGS "-DCMAKE_GENERATOR_PLATFORM=x64")
-endif()
-
-ExternalProject_Add(
- MatrixStructs
-
- GIT_REPOSITORY https://github.com/mujx/matrix-structs
- GIT_TAG 5e57c2385a79b6629d1998fec4a7c0baee23555e
-
- BUILD_IN_SOURCE 1
- SOURCE_DIR ${MATRIX_STRUCTS_ROOT}
- CONFIGURE_COMMAND ${CMAKE_COMMAND}
- -DCMAKE_BUILD_TYPE=Release ${MATRIX_STRUCTS_ROOT}
- ${WINDOWS_FLAGS}
- BUILD_COMMAND ${CMAKE_COMMAND} --build ${MATRIX_STRUCTS_ROOT} --config Release
- INSTALL_COMMAND ""
-)
|
