aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-04-28 11:35:58 +0000
committerHubert Chathi <hubert@uhoreg.ca>2019-04-28 11:35:58 +0000
commit327d6ac0eb788429dcbb0b012037ea30020a14fe (patch)
treef5021b580aad53bde9d236a099b8edcf14268773
parent992323c37cfa997939938281cb08f84ec8968a5b (diff)
parent6eca9f1278e9874c9c6bb31555d164c376d264ed (diff)
Merge branch 'poljar/cmake_sas' into 'master'
cmake: Add the SAS functions to the CMake build. See merge request matrix-org/olm!1
-rw-r--r--CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 390db27..6761295 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,7 @@ add_library(olm
src/session.cpp
src/utility.cpp
src/pk.cpp
+ src/sas.c
src/ed25519.c
src/error.c
@@ -79,6 +80,7 @@ install(FILES
${CMAKE_SOURCE_DIR}/include/olm/outbound_group_session.h
${CMAKE_SOURCE_DIR}/include/olm/inbound_group_session.h
${CMAKE_SOURCE_DIR}/include/olm/pk.h
+ ${CMAKE_SOURCE_DIR}/include/olm/sas.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/olm)
# Export the targets to a script.