From: Kornel Benko <kornel@lyx.org>
Date: Thu, 26 Nov 2015 11:08:13 +0000 (+0100)
Subject: Cmake: ENCODING parameter in file(STRINGS ...) only valid for cmake version >= 3.1
X-Git-Tag: 2.2.0alpha2~19
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=21c265addb7bce6ba8e4dd59100f1c3bd5bda5c5;p=features.git

Cmake: ENCODING parameter in file(STRINGS ...) only valid for cmake version >= 3.1
---

diff --git a/development/autotests/ExportTests.cmake b/development/autotests/ExportTests.cmake
index 98ef8fad17..6beee79cbd 100644
--- a/development/autotests/ExportTests.cmake
+++ b/development/autotests/ExportTests.cmake
@@ -150,7 +150,12 @@ set(known_labels "export" "key" "layout" "load" "lyx2lyx"
 
 macro(loadTestList filename resList)
   # Create list of strings from a file without comments
-  file(STRINGS ${filename} tempList ENCODING "UTF-8")
+  # ENCODING parameter is a new feature in cmake 3.1
+  if (CMAKE_VERSION VERSION_GREATER "3.1")
+    file(STRINGS ${filename} tempList ENCODING "UTF-8")
+  else()
+    file(STRINGS ${filename} tempList)
+  endif()
   set(${resList})
   set(sublabel)
   set(mylabels "")