diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-06-04 11:07:31 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-06-04 11:07:31 +0900 |
| commit | 5c4e3578317b4dd585cc6419afde90ebc345dc0c (patch) | |
| tree | 64a334fc5319d569024cb1145bb6613c9449332c | |
| parent | fc0a6d894637517a3b88fc0534621d5fb6a4fbbc (diff) | |
| download | libquotient-5c4e3578317b4dd585cc6419afde90ebc345dc0c.tar.gz libquotient-5c4e3578317b4dd585cc6419afde90ebc345dc0c.zip | |
Make libQMatrixClient buildable outside of Quaternion
| -rw-r--r-- | CMakeLists.txt | 18 | ||||
| -rw-r--r-- | lib/csapi/definitions/push_rule.h | 2 | ||||
| -rw-r--r-- | lib/csapi/definitions/push_ruleset.h | 2 | ||||
| -rw-r--r-- | lib/csapi/pushrules.h | 8 |
4 files changed, 15 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index aa473adc..ad9c8555 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,26 +95,26 @@ file(GLOB_RECURSE API_DEFS RELATIVE ${PROJECT_SOURCE_DIR} ${API_DEF_PATH}/definitions/*.yaml ${MATRIX_DOC_PATH}/event-schemas/schema/* ) -set(GTAD_CONFIG_DIR lib/csapi) -set(GEN_SRC_DIR lib/csapi) +set(CSAPI_DIR csapi) +set(FULL_CSAPI_DIR lib/${CSAPI_DIR}) if (MATRIX_DOC_PATH AND GTAD_PATH) add_custom_target(update-api - ${GTAD_PATH} --config ${GTAD_CONFIG_DIR}/gtad.yaml --out ${GEN_SRC_DIR} + ${GTAD_PATH} --config ${CSAPI_DIR}/gtad.yaml --out ${CSAPI_DIR} ${API_DEF_PATH} cas_login_redirect.yaml- cas_login_ticket.yaml- old_sync.yaml- room_initial_sync.yaml- # deprecated sync.yaml- - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - SOURCES ${GTAD_CONFIG_DIR}/gtad.yaml - ${GTAD_CONFIG_DIR}/{{base}}.h.mustache - ${GTAD_CONFIG_DIR}/{{base}}.cpp.mustache + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/lib + SOURCES ${FULL_CSAPI_DIR}/gtad.yaml + ${FULL_CSAPI_DIR}/{{base}}.h.mustache + ${FULL_CSAPI_DIR}/{{base}}.cpp.mustache ${API_DEFS} VERBATIM ) endif() -aux_source_directory(${GEN_SRC_DIR} libqmatrixclient_job_SRCS) -aux_source_directory(${GEN_SRC_DIR}/definitions libqmatrixclient_def_SRCS) +aux_source_directory(${FULL_CSAPI_DIR} libqmatrixclient_job_SRCS) +aux_source_directory(${FULL_CSAPI_DIR}/definitions libqmatrixclient_def_SRCS) set(example_SRCS examples/qmc-example.cpp) diff --git a/lib/csapi/definitions/push_rule.h b/lib/csapi/definitions/push_rule.h index 853210d0..74ecf79c 100644 --- a/lib/csapi/definitions/push_rule.h +++ b/lib/csapi/definitions/push_rule.h @@ -5,7 +5,7 @@ #pragma once -#include "lib/csapi/definitions/push_condition.h" +#include "csapi/definitions/push_condition.h" #include "converters.h" #include <QtCore/QVector> #include <QtCore/QVariant> diff --git a/lib/csapi/definitions/push_ruleset.h b/lib/csapi/definitions/push_ruleset.h index 96199a11..5e8bc02d 100644 --- a/lib/csapi/definitions/push_ruleset.h +++ b/lib/csapi/definitions/push_ruleset.h @@ -7,7 +7,7 @@ #include <QtCore/QVector> #include "converters.h" -#include "lib/csapi/definitions/push_rule.h" +#include "csapi/definitions/push_rule.h" #include "converters.h" diff --git a/lib/csapi/pushrules.h b/lib/csapi/pushrules.h index a01049af..b5950e0c 100644 --- a/lib/csapi/pushrules.h +++ b/lib/csapi/pushrules.h @@ -6,11 +6,11 @@ #include "jobs/basejob.h" -#include "lib/csapi/definitions/push_ruleset.h" -#include <QtCore/QVector> +#include "csapi/definitions/push_ruleset.h" #include "converters.h" -#include "lib/csapi/definitions/push_rule.h" -#include "lib/csapi/definitions/push_condition.h" +#include "csapi/definitions/push_rule.h" +#include <QtCore/QVector> +#include "csapi/definitions/push_condition.h" namespace QMatrixClient { |