diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2011-02-23 21:07:15 +0000 |
---|---|---|
committer | Tom Rini <tom_rini@mentor.com> | 2011-02-23 14:08:21 -0700 |
commit | 6ed0541653ab849587285ae0cbf4f0183da51bd3 (patch) | |
tree | 3c49cd94edcc90a240cfa4914b8c3a63cce82e66 /recipes/cmake | |
parent | 07fdc0e4e93c33cff62e6265074e662ed533fdf3 (diff) | |
download | openembedded-6ed0541653ab849587285ae0cbf4f0183da51bd3.tar.gz |
cmake: add OE qt4-tools-{native,sdk} support
* make it find qmake2, moc4 and others
* convert to INC_PR
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Tom Rini <tom_rini@mentor.com>
Diffstat (limited to 'recipes/cmake')
-rw-r--r-- | recipes/cmake/cmake-2.8.3/support-oe-qt4-tools-names.patch | 85 | ||||
-rw-r--r-- | recipes/cmake/cmake-native_2.8.3.bb | 2 | ||||
-rw-r--r-- | recipes/cmake/cmake-sdk_2.8.3.bb | 2 | ||||
-rw-r--r-- | recipes/cmake/cmake.inc | 5 | ||||
-rw-r--r-- | recipes/cmake/cmake_2.8.3.bb | 2 |
5 files changed, 92 insertions, 4 deletions
diff --git a/recipes/cmake/cmake-2.8.3/support-oe-qt4-tools-names.patch b/recipes/cmake/cmake-2.8.3/support-oe-qt4-tools-names.patch new file mode 100644 index 0000000000..b4569235f7 --- /dev/null +++ b/recipes/cmake/cmake-2.8.3/support-oe-qt4-tools-names.patch @@ -0,0 +1,85 @@ +--- a/Modules/FindQt4.cmake ++++ b/Modules/FindQt4.cmake +@@ -461,7 +461,7 @@ + # check for qmake + # Debian uses qmake-qt4 + # macports' Qt uses qmake-mac +-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS ++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac PATHS + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin" +@@ -988,13 +988,13 @@ + ENDIF(QT_QMAKE_CHANGED) + + FIND_PROGRAM(QT_MOC_EXECUTABLE +- NAMES moc-qt4 moc ++ NAMES moc-qt4 moc4 moc + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) + + FIND_PROGRAM(QT_UIC_EXECUTABLE +- NAMES uic-qt4 uic ++ NAMES uic-qt4 uic4 uic + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) +@@ -1006,49 +1006,49 @@ + ) + + FIND_PROGRAM(QT_RCC_EXECUTABLE +- NAMES rcc ++ NAMES rcc4 rcc + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) + + FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE +- NAMES qdbuscpp2xml ++ NAMES qdbuscpp2xml4 qdbuscpp2xml + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) + + FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE +- NAMES qdbusxml2cpp ++ NAMES qdbusxml2cpp4 qdbusxml2cpp + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) + + FIND_PROGRAM(QT_LUPDATE_EXECUTABLE +- NAMES lupdate-qt4 lupdate ++ NAMES lupdate-qt4 lupdate4 lupdate + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) + + FIND_PROGRAM(QT_LRELEASE_EXECUTABLE +- NAMES lrelease-qt4 lrelease ++ NAMES lrelease-qt4 lrelease4 lrelease + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) + + FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE +- NAMES qcollectiongenerator-qt4 qcollectiongenerator ++ NAMES qcollectiongenerator-qt4 qcollectiongenerator4 qcollectiongenerator + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) + + FIND_PROGRAM(QT_DESIGNER_EXECUTABLE +- NAMES designer-qt4 designer ++ NAMES designer-qt4 designer4 designer + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) + + FIND_PROGRAM(QT_LINGUIST_EXECUTABLE +- NAMES linguist-qt4 linguist ++ NAMES linguist-qt4 linguist4 linguist + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) diff --git a/recipes/cmake/cmake-native_2.8.3.bb b/recipes/cmake/cmake-native_2.8.3.bb index e04885fcaf..fa5e160450 100644 --- a/recipes/cmake/cmake-native_2.8.3.bb +++ b/recipes/cmake/cmake-native_2.8.3.bb @@ -1,7 +1,7 @@ inherit native require cmake.inc -PR = "r1" +PR = "${INC_PR}.0" SRC_URI[md5sum] = "a76a44b93acf5e3badda9de111385921" SRC_URI[sha256sum] = "689ed02786b5cefa5515c7716784ee82a82e8ece6be5a3d629ac3cc0c05fc288" diff --git a/recipes/cmake/cmake-sdk_2.8.3.bb b/recipes/cmake/cmake-sdk_2.8.3.bb index 5035b81f55..2dd7a17cb3 100644 --- a/recipes/cmake/cmake-sdk_2.8.3.bb +++ b/recipes/cmake/cmake-sdk_2.8.3.bb @@ -1,7 +1,7 @@ inherit sdk require cmake.inc -PR = "r1" +PR = "${INC_PR}.0" SRC_URI[md5sum] = "a76a44b93acf5e3badda9de111385921" SRC_URI[sha256sum] = "689ed02786b5cefa5515c7716784ee82a82e8ece6be5a3d629ac3cc0c05fc288" diff --git a/recipes/cmake/cmake.inc b/recipes/cmake/cmake.inc index ef6f5aa1fc..814743e122 100644 --- a/recipes/cmake/cmake.inc +++ b/recipes/cmake/cmake.inc @@ -5,10 +5,11 @@ DESCRIPTION = "A cross-platform, open-source make system" HOMEPAGE = "http://www.cmake.org/" LICENSE = "Berkeley-style license" SECTION = "console/utils" -PR = "r2" +INC_PR = "r2" CMAKE_MAJOR_VERSION = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" -SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz" +SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ + file://support-oe-qt4-tools-names.patch" inherit autotools diff --git a/recipes/cmake/cmake_2.8.3.bb b/recipes/cmake/cmake_2.8.3.bb index 8c963885cf..cb5f7f71c9 100644 --- a/recipes/cmake/cmake_2.8.3.bb +++ b/recipes/cmake/cmake_2.8.3.bb @@ -1,5 +1,7 @@ require cmake.inc +PR = "${INC_PR}.0" + inherit cmake DEPENDS += "curl expat zlib" |