From 6eed233a20154a5a0187b07d35f598a194c27dff Mon Sep 17 00:00:00 2001 From: thomas Date: Thu, 11 Jul 2019 13:36:03 +0200 Subject: [PATCH 1/3] cmake: Bump version to 3.14.5 --- cmake.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake.be0 b/cmake.be0 index b62579d66..0f90574be 100755 --- a/cmake.be0 +++ b/cmake.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION cmake-3.8.0-0 +# BEE_VERSION cmake-3.14.5-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From bc951a262b4e8f9fcb8c4c41adba640885f7dd68 Mon Sep 17 00:00:00 2001 From: thomas Date: Thu, 11 Jul 2019 13:43:04 +0200 Subject: [PATCH 2/3] cmake: Enforce bootstrap and enable GUI By using cmakes configure, it performs a bootstrap build. Otherwise the build would skip bootstrapping and use the installed cmake. Needless to say that cmakes configure is incompatible to any bee magic. The GUI is a nice to have, also it helps to discover config variables. --- cmake.be0 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cmake.be0 b/cmake.be0 index 0f90574be..36bcb2e43 100755 --- a/cmake.be0 +++ b/cmake.be0 @@ -53,9 +53,14 @@ SRCURL[0]="https://cmake.org/files/v${PKGVERSION[2]}/cmake-${PKGVERSION}.tar.gz" # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + ${S}/configure \ + --prefix=/usr \ + --docdir=share/doc/cmake-${PKGVERSION[2]} \ + --mandir=share/man \ + --qt-qmake=/usr/local/qt4/bin/qmake \ + --qt-gui +} #mee_build() { # bee_build From f2218ccbe252201a72fc15cc75949e2214aa04a9 Mon Sep 17 00:00:00 2001 From: thomas Date: Thu, 11 Jul 2019 13:47:17 +0200 Subject: [PATCH 3/3] cmake: Do tests as a separate step --- cmake.be0 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/cmake.be0 b/cmake.be0 index 36bcb2e43..e297e1d8a 100755 --- a/cmake.be0 +++ b/cmake.be0 @@ -64,11 +64,17 @@ mee_configure() { #mee_build() { # bee_build -# # Test suite currently fails. -# # https://gitlab.kitware.com/cmake/cmake/issues/16823 -# start_cmd ${B}/bin/ctest ${BEE_MAKEFLAGS} #} +mee_build_post() { + # Two GTK2-mm tests fail (570: GTK2Targets.giomm and + # 572: GTK2Targets.cairomm). This is not surprising, + # its owed to the old C++ abi used at compile time. + # The other two (5: kwsys.testSystemTools & 206: CTest.UpdateCVS) + # fail because they are run as root (ehemmm... :). + make test || true +} + #mee_install() { # bee_install #}