[Lunar-commits] <moonbase> tulip: Switching the BUILD to cmake, the configure/make barfs.

Dennis `stumbles` Veatch stumbles at lunar-linux.org
Thu Nov 18 01:48:43 CET 2010


commit 49f08f13eaada98d1247521d1dc81c6639f6beeb
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Wed Nov 17 19:48:43 2010 -0500

    tulip: Switching the BUILD to cmake, the configure/make barfs.
---
 qt4-apps/tulip/BUILD   |   10 +++-------
 qt4-apps/tulip/DEPENDS |    1 +
 qt4-apps/tulip/DETAILS |    1 -
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/qt4-apps/tulip/BUILD b/qt4-apps/tulip/BUILD
index d696f82..220f5ce 100644
--- a/qt4-apps/tulip/BUILD
+++ b/qt4-apps/tulip/BUILD
@@ -1,14 +1,10 @@
 (
 
-  . /etc/profile.d/qt4.rc &&
+  source /etc/profile.d/qt4.rc   &&
 
-  OPTS="--with-qt-includes=/usr/include/qt4 --with-qt-libraries=/usr/lib/qt4" &&
-  CFLAGS="-L /usr/lib/qt4"
-  if module_installed teTeX ; then
-   export PDFXMLTEX="pdfetex"
-  fi &&
+  cmake . -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX -DCMAKE_BUILD_TYPE=RELEASE $OPTS  &&
 
-  default_build &&
+  default_make &&
 
   # Desktop menu entry
   cat > ${MODULE}.desktop << EOF  &&
diff --git a/qt4-apps/tulip/DEPENDS b/qt4-apps/tulip/DEPENDS
index a90a03e..9aea2a1 100644
--- a/qt4-apps/tulip/DEPENDS
+++ b/qt4-apps/tulip/DEPENDS
@@ -1,3 +1,4 @@
+depends cmake
 depends qt-assistant
 
 optional_depends ftgl "" "" "for ftgl support"
diff --git a/qt4-apps/tulip/DETAILS b/qt4-apps/tulip/DETAILS
index 055f76e..c36a21a 100644
--- a/qt4-apps/tulip/DETAILS
+++ b/qt4-apps/tulip/DETAILS
@@ -9,7 +9,6 @@
          UPDATED=20101106
            SHORT="Graph visualization software"
 
-PSAFE=no
 cat << EOF
 The research by the information visualization community shows clearly that using
 a visual representation of data-sets enables faster analysis by the end users. 


More information about the Lunar-commits mailing list