summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/cmake')
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb7
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_2.8.11.bb5
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc2
-rw-r--r--meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch70
-rw-r--r--meta/recipes-devtools/cmake/cmake_2.8.11.bb (renamed from meta/recipes-devtools/cmake/cmake_2.8.10.2.bb)6
5 files changed, 21 insertions, 69 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb
deleted file mode 100644
index 01860a745a..0000000000
--- a/meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require cmake.inc
2inherit native
3
4PR = "${INC_PR}.0"
5
6SRC_URI[md5sum] = "097278785da7182ec0aea8769d06860c"
7SRC_URI[sha256sum] = "ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1"
diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.11.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.11.bb
new file mode 100644
index 0000000000..dfe103f4c0
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake-native_2.8.11.bb
@@ -0,0 +1,5 @@
1require cmake.inc
2inherit native
3
4SRC_URI[md5sum] = "be6008f2299613d23fe82ab53ef7472e"
5SRC_URI[sha256sum] = "20d0d3661797fa82c19e7a75c7315c640e001cb3238331ca170bb0fae27feee5"
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index b2cba5e7e6..6144d51be4 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -9,8 +9,6 @@ LICENSE = "BSD"
9LIC_FILES_CHKSUM = "file://Copyright.txt;md5=bb2fa3a08736b842556f6171bb9e8ae1 \ 9LIC_FILES_CHKSUM = "file://Copyright.txt;md5=bb2fa3a08736b842556f6171bb9e8ae1 \
10 file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2" 10 file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2"
11 11
12INC_PR = "r1"
13
14CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}" 12CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}"
15 13
16SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ 14SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
diff --git a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
index 258971b8a4..0e311f70e3 100644
--- a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
+++ b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
@@ -11,36 +11,20 @@ Upstream-Status: Inappropriate [embedded specific]
11 11
12Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 12Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
13 13
14Index: cmake-2.8.10.1/Modules/FindQt4.cmake 14Index: cmake-2.8.11/Modules/FindQt4.cmake
15=================================================================== 15===================================================================
16--- cmake-2.8.10.1.orig/Modules/FindQt4.cmake 16--- cmake-2.8.11.orig/Modules/FindQt4.cmake
17+++ cmake-2.8.10.1/Modules/FindQt4.cmake 17+++ cmake-2.8.11/Modules/FindQt4.cmake
18@@ -497,7 +497,7 @@ get_filename_component(qt_install_versio 18@@ -569,7 +569,7 @@ endfunction()
19 # check for qmake
20 # Debian uses qmake-qt4
21 # macports' Qt uses qmake-mac
22-find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac
23+find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac
24 PATHS
25 ENV QTDIR
26 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
27@@ -982,13 +982,13 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
28 endif()
29 19
30 find_program(QT_MOC_EXECUTABLE 20 set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
31- NAMES moc-qt4 moc
32+ NAMES moc-qt4 moc4 moc
33 PATHS ${QT_BINARY_DIR}
34 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
35 )
36 21
37 find_program(QT_UIC_EXECUTABLE 22-set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac)
38- NAMES uic-qt4 uic 23+set(_QT4_QMAKE_NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac)
39+ NAMES uic-qt4 uic4 uic 24 _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
40 PATHS ${QT_BINARY_DIR} 25
41 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH 26 if (QT_QMAKE_EXECUTABLE AND QTVERSION)
42 ) 27@@ -1157,19 +1157,19 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
43@@ -1000,49 +1000,49 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
44 ) 28 )
45 29
46 find_program(QT_RCC_EXECUTABLE 30 find_program(QT_RCC_EXECUTABLE
@@ -59,42 +43,16 @@ Index: cmake-2.8.10.1/Modules/FindQt4.cmake
59 43
60 find_program(QT_DBUSXML2CPP_EXECUTABLE 44 find_program(QT_DBUSXML2CPP_EXECUTABLE
61- NAMES qdbusxml2cpp 45- NAMES qdbusxml2cpp
62+ NAMES qdbusxml2cpp4 qdbusxml2cpp 46+ NAMES qdbusxml2cp4 qdbusxml2cpp
63 PATHS ${QT_BINARY_DIR}
64 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
65 )
66
67 find_program(QT_LUPDATE_EXECUTABLE
68- NAMES lupdate-qt4 lupdate
69+ NAMES lupdate-qt4 lupdate4 lupdate
70 PATHS ${QT_BINARY_DIR} 47 PATHS ${QT_BINARY_DIR}
71 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH 48 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
72 ) 49 )
73 50@@ -1187,7 +1187,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
74 find_program(QT_LRELEASE_EXECUTABLE
75- NAMES lrelease-qt4 lrelease
76+ NAMES lrelease-qt4 lrelease4 lrelease
77 PATHS ${QT_BINARY_DIR}
78 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
79 ) 51 )
80 52
81 find_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE 53 find_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE
82- NAMES qcollectiongenerator-qt4 qcollectiongenerator 54- NAMES qcollectiongenerator-qt4 qcollectiongenerator
83+ NAMES qcollectiongenerator-qt4 qcollectiongenerator4 qcollectiongenerator 55+ NAMES qcollectiongenerator-qt4 qcollectiongenerator qcollectiongenerator4
84 PATHS ${QT_BINARY_DIR}
85 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
86 )
87
88 find_program(QT_DESIGNER_EXECUTABLE
89- NAMES designer-qt4 designer
90+ NAMES designer-qt4 designer4 designer
91 PATHS ${QT_BINARY_DIR}
92 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
93 )
94
95 find_program(QT_LINGUIST_EXECUTABLE
96- NAMES linguist-qt4 linguist
97+ NAMES linguist-qt4 linguist4 linguist
98 PATHS ${QT_BINARY_DIR} 56 PATHS ${QT_BINARY_DIR}
99 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH 57 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
100 ) 58 )
diff --git a/meta/recipes-devtools/cmake/cmake_2.8.10.2.bb b/meta/recipes-devtools/cmake/cmake_2.8.11.bb
index 65f75b4dca..bc0715594c 100644
--- a/meta/recipes-devtools/cmake/cmake_2.8.10.2.bb
+++ b/meta/recipes-devtools/cmake/cmake_2.8.11.bb
@@ -4,12 +4,10 @@ inherit cmake
4 4
5DEPENDS += "curl expat zlib libarchive ncurses" 5DEPENDS += "curl expat zlib libarchive ncurses"
6 6
7PR = "${INC_PR}.0"
8
9SRC_URI += "file://dont-run-cross-binaries.patch" 7SRC_URI += "file://dont-run-cross-binaries.patch"
10 8
11SRC_URI[md5sum] = "097278785da7182ec0aea8769d06860c" 9SRC_URI[md5sum] = "be6008f2299613d23fe82ab53ef7472e"
12SRC_URI[sha256sum] = "ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1" 10SRC_URI[sha256sum] = "20d0d3661797fa82c19e7a75c7315c640e001cb3238331ca170bb0fae27feee5"
13 11
14# Strip ${prefix} from ${docdir}, set result into docdir_stripped 12# Strip ${prefix} from ${docdir}, set result into docdir_stripped
15python () { 13python () {