Merge branch 'develop' into 'master'

Data directory lookup fix See merge request !3

Merge branch 'develop' into 'master'
Data directory lookup fix See merge request !3
a14e44af · Mateusz Gniewkowski · d079ca39 · 7d1e7681 · a14e44af · a14e44af
Commit a14e44af authored Feb 23, 2021 by Mateusz Gniewkowski
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

.gitlab-ci.yml .gitlab-ci.yml +1 -1

libtoki/CMakeLists.txt libtoki/CMakeLists.txt +1 -1

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
-image: clarinpl/cpp
+image: clarinpl/cpp:16.04

 stages:
  - build

--- 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"