From 7d1e7681da36c68f88787568604bbba7eedc3a09 Mon Sep 17 00:00:00 2001
From: Bartosz Ziemba <b.ziemba@protonmail.com>
Date: Mon, 22 Feb 2021 12:21:35 +0100
Subject: [PATCH] Data directory lookup fix
---
.gitlab-ci.yml | 2 +-
libtoki/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d46593b..7ad22dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: clarinpl/cpp
+image: clarinpl/cpp:16.04
stages:
- build
diff --git a/libtoki/CMakeLists.txt b/libtoki/CMakeLists.txt
index 363acf3..4edab8f 100644
--- a/libtoki/CMakeLists.txt
+++ b/libtoki/CMakeLists.txt
@@ -136,7 +136,7 @@ endif(NOT ${LibXML++_PKGCONF_VERSION} VERSION_LESS 2.40)
)
install(
DIRECTORY ${LIBTOKI_SRC_DATA_DIR}/
- DESTINATION ${LIBTOKI_INSTALL_DATA_DIR}
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBTOKI_INSTALL_DATA_DIR}
FILES_MATCHING PATTERN "*.ini"
PATTERN "*.srx"
PATTERN "*.lex"
--
GitLab