From 51c4739231a637ee600e21e99e2d0bedb78a99e7 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Wed, 28 May 2014 12:23:36 +0100 Subject: Fix finding of Qt5LinguistTools on some systems Although ECM does not make use of a compiler directly, the language affects the search path for CMake packages; in particular, a package installed to /usr/lib64/cmake will not be found if NONE is passed as the language argument to project(). This meant that a 64-bit version of Qt5LinguistTools would not be found on systems where 64-bit libraries are not installed in the "default architecture" location (/usr/lib). With this change, the configure step performs some otherwise-unnecessary tests. We minimise this by explicitly specifying the C language (which is also what some of the tests use), rather than letting it be the default (which is C and C++). REVIEW: 118374 --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 369bc948..a28d6f4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) -project(extra-cmake-modules NONE) +# We need to set a language to find CMake packages installed in +# architecture-dependent locations (like /usr/lib64) +project(extra-cmake-modules C) set(ECM_MAJOR_VERSION 0) set(ECM_MINOR_VERSION 0) -- cgit v1.2.1