Merge branch 'poljar/cmake_sas' into 'master'

cmake: Add the SAS functions to the CMake build.

See merge request matrix-org/olm!1
This commit is contained in:
Hubert Chathi 2019-04-28 11:35:58 +00:00
commit 327d6ac0eb

View file

@ -32,6 +32,7 @@ add_library(olm
src/session.cpp src/session.cpp
src/utility.cpp src/utility.cpp
src/pk.cpp src/pk.cpp
src/sas.c
src/ed25519.c src/ed25519.c
src/error.c src/error.c
@ -79,6 +80,7 @@ install(FILES
${CMAKE_SOURCE_DIR}/include/olm/outbound_group_session.h ${CMAKE_SOURCE_DIR}/include/olm/outbound_group_session.h
${CMAKE_SOURCE_DIR}/include/olm/inbound_group_session.h ${CMAKE_SOURCE_DIR}/include/olm/inbound_group_session.h
${CMAKE_SOURCE_DIR}/include/olm/pk.h ${CMAKE_SOURCE_DIR}/include/olm/pk.h
${CMAKE_SOURCE_DIR}/include/olm/sas.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/olm) DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/olm)
# Export the targets to a script. # Export the targets to a script.