From c671cd464c2ac29538572a4257b5d1fe91f4cd2d Mon Sep 17 00:00:00 2001 From: timoreo Date: Sun, 10 Dec 2023 19:58:05 +0100 Subject: [PATCH] Move OLM to sdk --- .gitmodules | 3 +++ CMakeLists.txt | 3 ++- olm | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .gitmodules create mode 160000 olm diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..4dfd181 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "olm"] + path = olm + url = git@ahur.ac:timoreo/olm.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e66d40..02f987e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,7 @@ list(APPEND CMAKE_PREFIX_PATH "${DEVKITPRO}/portlibs/3ds/lib/pkgconfig/") cmake_minimum_required(VERSION 3.24) project(matrix-3ds-sdk) +add_subdirectory(olm) add_library(matrix-3ds-sdk source/matrixclient.cpp source/memorystore.cpp source/util.cpp) find_package(PkgConfig REQUIRED) pkg_check_modules(jansson REQUIRED IMPORTED_TARGET jansson) @@ -12,7 +13,7 @@ file(READ "${DEVKITPRO}/portlibs/3ds/lib/libcurl.la" contents) if (contents MATCHES "dependency_libs *= *'([^']*)'") string(STRIP "${CMAKE_MATCH_1}" deps) string(REGEX REPLACE " +" ";" deps "${deps}") - target_link_libraries(matrix-3ds-sdk PRIVATE curl PkgConfig::jansson ${deps}) + target_link_libraries(matrix-3ds-sdk PRIVATE curl PkgConfig::jansson olm ${deps}) endif() target_include_directories(matrix-3ds-sdk PUBLIC source include "${DEVKITPRO}/portlibs/3ds/include/") diff --git a/olm b/olm new file mode 160000 index 0000000..cb3fe62 --- /dev/null +++ b/olm @@ -0,0 +1 @@ +Subproject commit cb3fe622ae742674436e361bdefe534d300ced47