cmake: update to 2.8.5-rc3

(From OE-Core rev: 2b229f4150b8375f0d35e11464dcbe307b720d81)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

4 files changed, 36 insertions, 24 deletions

diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.3.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.3.bb
deleted file mode 100644
index a68a25f406..0000000000
--- a/meta/recipes-devtools/cmake/cmake-native_2.8.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require cmake.inc
-inherit native
-
-PR = "${INC_PR}.1"
-
-SRC_URI[md5sum] = "a76a44b93acf5e3badda9de111385921"
-SRC_URI[sha256sum] = "689ed02786b5cefa5515c7716784ee82a82e8ece6be5a3d629ac3cc0c05fc288"
diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.5.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.5.bb
new file mode 100644
index 0000000000..c8da1cb2c7
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake-native_2.8.5.bb
@@ -0,0 +1,12 @@
+require cmake.inc
+inherit native
+
+# This was need to keep version consistent - will be removed once 2.8.5 is released
+SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-2.8.5-rc3.tar.gz \
+           file://support-oe-qt4-tools-names.patch"
+S = "${WORKDIR}/cmake-2.8.5-rc3"
+
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "2d8018f8fa4c499e2c5b288d71660cba"
+SRC_URI[sha256sum] = "2987befc451f6404ea93bb99f00a38b80724fb655f121fed3bb0a08b65a771c8"
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 9bccd40d71..147c2498f8 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,9 +11,11 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
 
---- a/Modules/FindQt4.cmake
-+++ b/Modules/FindQt4.cmake
-@@ -461,7 +461,7 @@
+Index: cmake-2.8.5-rc3/Modules/FindQt4.cmake
+===================================================================
+--- cmake-2.8.5-rc3.orig/Modules/FindQt4.cmake  2011-06-27 14:41:05.000000000 +0000
++++ cmake-2.8.5-rc3/Modules/FindQt4.cmake       2011-07-08 15:31:58.057170949 +0000
+@@ -473,7 +473,7 @@
  # check for qmake
  # Debian uses qmake-qt4
  # macports' Qt uses qmake-mac
@@ -22,77 +24,77 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
    "[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 @@
+@@ -944,13 +944,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
+     NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
      )
  
    FIND_PROGRAM(QT_UIC_EXECUTABLE
 -    NAMES uic-qt4 uic
 +    NAMES uic-qt4 uic4 uic
      PATHS ${QT_BINARY_DIR}
-     NO_DEFAULT_PATH
+     NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
      )
-@@ -1006,49 +1006,49 @@
+@@ -962,49 +962,49 @@
      )
  
    FIND_PROGRAM(QT_RCC_EXECUTABLE 
 -    NAMES rcc
 +    NAMES rcc4 rcc
      PATHS ${QT_BINARY_DIR}
-     NO_DEFAULT_PATH
+     NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
      )
  
    FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE 
 -    NAMES qdbuscpp2xml
 +    NAMES qdbuscpp2xml4 qdbuscpp2xml
      PATHS ${QT_BINARY_DIR}
-     NO_DEFAULT_PATH
+     NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
      )
  
    FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE 
 -    NAMES qdbusxml2cpp
 +    NAMES qdbusxml2cpp4 qdbusxml2cpp
      PATHS ${QT_BINARY_DIR}
-     NO_DEFAULT_PATH
+     NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
      )
  
    FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
 -    NAMES lupdate-qt4 lupdate
 +    NAMES lupdate-qt4 lupdate4 lupdate
      PATHS ${QT_BINARY_DIR}
-     NO_DEFAULT_PATH
+     NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
      )
  
    FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
 -    NAMES lrelease-qt4 lrelease
 +    NAMES lrelease-qt4 lrelease4 lrelease
      PATHS ${QT_BINARY_DIR}
-     NO_DEFAULT_PATH
+     NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
      )
  
    FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE
 -    NAMES qcollectiongenerator-qt4 qcollectiongenerator
 +    NAMES qcollectiongenerator-qt4 qcollectiongenerator4 qcollectiongenerator
      PATHS ${QT_BINARY_DIR}
-     NO_DEFAULT_PATH
+     NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
      )
  
    FIND_PROGRAM(QT_DESIGNER_EXECUTABLE
 -    NAMES designer-qt4 designer
 +    NAMES designer-qt4 designer4 designer
      PATHS ${QT_BINARY_DIR}
-     NO_DEFAULT_PATH
+     NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
      )
  
    FIND_PROGRAM(QT_LINGUIST_EXECUTABLE
 -    NAMES linguist-qt4 linguist
 +    NAMES linguist-qt4 linguist4 linguist
      PATHS ${QT_BINARY_DIR}
-     NO_DEFAULT_PATH
+     NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
      )
diff --git a/meta/recipes-devtools/cmake/cmake_2.8.3.bb b/meta/recipes-devtools/cmake/cmake_2.8.5.bb
index d1048ed6ce..2a9a82c53a 100644
--- a/meta/recipes-devtools/cmake/cmake_2.8.3.bb
+++ b/meta/recipes-devtools/cmake/cmake_2.8.5.bb
@@ -6,10 +6,15 @@ DEPENDS += "curl expat zlib libarchive ncurses"
 
 PR = "${INC_PR}.0"
 
+# This was need to keep version consistent - will be removed once 2.8.5 is released
+SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-2.8.5-rc3.tar.gz \
+           file://support-oe-qt4-tools-names.patch"
+S = "${WORKDIR}/cmake-2.8.5-rc3"
+
 SRC_URI += "file://dont-run-cross-binaries.patch"
 
-SRC_URI[md5sum] = "a76a44b93acf5e3badda9de111385921"
-SRC_URI[sha256sum] = "689ed02786b5cefa5515c7716784ee82a82e8ece6be5a3d629ac3cc0c05fc288"
+SRC_URI[md5sum] = "2d8018f8fa4c499e2c5b288d71660cba"
+SRC_URI[sha256sum] = "2987befc451f6404ea93bb99f00a38b80724fb655f121fed3bb0a08b65a771c8"
 
 # Strip ${prefix} from ${docdir}, set result into docdir_stripped
 python () {