aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2018-06-04 16:51:19 +0900
committerKitsune Ral <Kitsune-Ral@users.sf.net>2018-06-04 16:51:19 +0900
commit936e7673e0a08da3d6e10fcfed85e53db210295e (patch)
tree1c3a8205ee4f7d40065f4f5f44b12eca1db2a7c1
parent5c4e3578317b4dd585cc6419afde90ebc345dc0c (diff)
downloadlibquotient-936e7673e0a08da3d6e10fcfed85e53db210295e.tar.gz
libquotient-936e7673e0a08da3d6e10fcfed85e53db210295e.zip
CMakeLists: fix build breakage if GTAD path is relative
-rw-r--r--CMakeLists.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad9c8555..07965389 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,6 +43,10 @@ endforeach ()
find_package(Qt5 5.4.1 REQUIRED Network Gui)
get_filename_component(Qt5_Prefix "${Qt5_DIR}/../../../.." ABSOLUTE)
+if (GTAD_PATH)
+ get_filename_component(ABS_GTAD_PATH "${GTAD_PATH}" ABSOLUTE)
+endif ()
+
message( STATUS )
message( STATUS "=============================================================================" )
message( STATUS " libqmatrixclient Build Information" )
@@ -54,7 +58,7 @@ message( STATUS "Using compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_V
message( STATUS "Using Qt ${Qt5_VERSION} at ${Qt5_Prefix}" )
if (MATRIX_DOC_PATH AND GTAD_PATH)
message( STATUS "Generating API stubs enabled" )
- message( STATUS " Using GTAD at ${GTAD_PATH}" )
+ message( STATUS " Using GTAD at ${ABS_GTAD_PATH}" )
message( STATUS " Using CS API files at ${MATRIX_DOC_PATH}/api/client-server" )
endif ()
message( STATUS "=============================================================================" )
@@ -99,7 +103,7 @@ 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 ${CSAPI_DIR}/gtad.yaml --out ${CSAPI_DIR}
+ ${ABS_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