From 50a117a7764ff134b57051a0456d4eac32ae7df5 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Thu, 19 Jul 2018 08:44:32 +0900
Subject: qmake/CMake: Add lib/application-service/definitions/*

---
 CMakeLists.txt       | 10 +++++++---
 libqmatrixclient.pri |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b78b831..a377ec4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,9 @@ set(libqmatrixclient_SRCS
 )
 
 set(CSAPI_DIR csapi)
+set(ASAPI_DIR application-service)
 set(FULL_CSAPI_DIR lib/${CSAPI_DIR})
+set(FULL_ASAPI_DIR lib/${ASAPI_DIR})
 if (MATRIX_DOC_PATH AND GTAD_PATH)
     file(GLOB_RECURSE API_DEFS RELATIVE ${PROJECT_SOURCE_DIR}
         ${ABS_API_DEF_PATH}/*.yaml
@@ -121,13 +123,15 @@ if (MATRIX_DOC_PATH AND GTAD_PATH)
 endif()
 
 aux_source_directory(${FULL_CSAPI_DIR} libqmatrixclient_job_SRCS)
-aux_source_directory(${FULL_CSAPI_DIR}/definitions libqmatrixclient_def_SRCS)
+aux_source_directory(${FULL_CSAPI_DIR}/definitions libqmatrixclient_csdef_SRCS)
+aux_source_directory(${FULL_ASAPI_DIR}/definitions libqmatrixclient_asdef_SRCS)
 
 set(example_SRCS examples/qmc-example.cpp)
 
 add_library(QMatrixClient ${libqmatrixclient_SRCS}
-            ${libqmatrixclient_job_SRCS} ${libqmatrixclient_def_SRCS})
-set(API_VERSION "0.3")
+            ${libqmatrixclient_job_SRCS} ${libqmatrixclient_csdef_SRCS}
+            ${libqmatrixclient_asdef_SRCS})
+set(API_VERSION "0.4")
 set_property(TARGET QMatrixClient PROPERTY VERSION "${API_VERSION}.0")
 set_property(TARGET QMatrixClient PROPERTY SOVERSION 0 )
 set_property(TARGET QMatrixClient PROPERTY
diff --git a/libqmatrixclient.pri b/libqmatrixclient.pri
index 4354b3f1..f2118ea1 100644
--- a/libqmatrixclient.pri
+++ b/libqmatrixclient.pri
@@ -40,6 +40,7 @@ HEADERS += \
     $$SRCPATH/jobs/postreadmarkersjob.h \
     $$files($$SRCPATH/csapi/*.h, false) \
     $$files($$SRCPATH/csapi/definitions/*.h, false) \
+    $$files($$SRCPATH/application-service/definitions/*.h, false) \
     $$SRCPATH/logging.h \
     $$SRCPATH/converters.h \
     $$SRCPATH/settings.h \
@@ -70,6 +71,7 @@ SOURCES += \
     $$SRCPATH/jobs/downloadfilejob.cpp \
     $$files($$SRCPATH/csapi/*.cpp, false) \
     $$files($$SRCPATH/csapi/definitions/*.cpp, false) \
+    $$files($$SRCPATH/application-service/definitions/*.cpp, false) \
     $$SRCPATH/logging.cpp \
     $$SRCPATH/converters.cpp \
     $$SRCPATH/settings.cpp \
-- 
cgit v1.2.3