gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cmake : bump to version 3.0.2 

The
cmake-0001-FindQt4-do-not-prepend-CMake-root-path-when-searchin.patch
patch has been merged upstream as part of commit
e8b8b37ef6fef094940d3384df5a1d421b9fa568.

[Thomas: tweak commit log by adding details about the patch being
removed.]

Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Jeremy Rosen 2014-09-22 13:31:07 +02:00 committed by Thomas Petazzoni
parent 65e92df4de
commit 4aef37b683
2 changed files with 2 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
package/cmake/cmake-0001-FindQt4-do-not-prepend-CMake-root-path-when-searchin.patch
View File

@ -1,38 +0,0 @@
From 02a18089402de70188f2cf7b33fcb6edf7506871 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 29 Dec 2013 13:35:18 +0100
Subject: [PATCH] FindQt4: do not prepend CMake root path when searching the
mkspecs directory
When searching for the mkspecs directory, FindQT4 uses the find_path()
function, but it doesn't pass the NO_CMAKE_FIND_ROOT_PATH, which means
that all paths are interpreted relatively to the CMAKE_FIND_ROOT_PATH.
However, both the ${qt_mkspecs_dirs} and ${qt_cross_paths} variable
that are passed as hints are already absolute paths, and do not need
to be prepended by the CMAKE_FIND_ROOT_PATH.
Due to this problem, FindQT4 was unable to find qconfig.pri, and
QT_MKSPECS_DIR was left defined to "NOTFOUND".
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Modules/FindQt4.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 28b8454..0b8ce92 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -760,7 +760,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
endforeach()
set(QT_MKSPECS_DIR NOTFOUND)
find_path(QT_MKSPECS_DIR NAMES qconfig.pri
- HINTS ${qt_cross_paths} ${qt_mkspecs_dirs}
+ HINTS ${qt_cross_paths} ${qt_mkspecs_dirs} NO_CMAKE_FIND_ROOT_PATH
DOC "The location of the Qt mkspecs containing qconfig.pri")
endif()
--
1.8.3.2

4
package/cmake/cmake.mk
View File

@ -4,8 +4,8 @@
#
################################################################################
CMAKE_VERSION_MAJOR = 2.8
CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).12.2
CMAKE_VERSION_MAJOR = 3.0
CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2
CMAKE_SITE = http://www.cmake.org/files/v$(CMAKE_VERSION_MAJOR)
CMAKE_LICENSE = BSD-3c
CMAKE_LICENSE_FILES = Copyright.txt