Changeset 886 for trunk/config/scripts

Timestamp:

Nov 19, 2008, 2:41:24 PM (16 years ago)

Author:

garnier

Message:

change and better Leopard check on Mac OSX

Location:

trunk/config/scripts

Files:

• env.csh.SH (modified) (2 diffs)
• env.sh.SH (modified) (2 diffs)
• install.sh.SH (modified) (4 diffs)

trunk/config/scripts/env.csh.SH

@@ -384 +384 @@
 endif 
 
-#+
-if ( X$g4_qthome != X ) then
-setenv QTHOME "$g4_qthome"
-echo "On this machine the QTHOME=\$QTHOME"
-endif
-
-
 
 #+
@@ -427 +420 @@
 echo "On this machine the XAWLIBS=\$XAWLIBS"
 endif 
+
+
+#
+# Qt Flags and Libs, messy, but needed for backward compatibility
+#+
+if ( "X$g4ui_build_qt_session" == "Xy" || "X$g4ui_use_qt" == "Xy" )  then
+setenv QTFLAGS "$g4_qt_cxxflags"
+setenv QTLIBS "$g4_qt_libs"
+setenv QTMOC "$g4_qt_moc"
+echo "On this machine the QTFLAGS=\$QTFLAGS"
+echo "On this machine the QTLIBS=\$QTLIBS"
+echo "On this machine the QTMOC=\$QTMOC"
+endif
+
+if ( "X$g4vis_build_openglqt_driver" == "Xy" || "X$g4vis_build_openglqt_driver" == "Xy" )  then
+if ( "X\$QTFLAGS" == "X" )  then
+setenv QTFLAGS "$g4_qt_cxxflags $g4_qt_gl_cxxflags"
+else
+setenv QTFLAGS "\$QTFLAGS $g4_qt_gl_cxxflags"
+endif
+if ( "X\$QTMOC" == "X" )  then
+setenv QTMOC "$g4_qt_moc"
+endif
+setenv GLQTLIBS "$g4_qt_libs $g4_qt_gl_libs"
+echo "On this machine the QTFLAGS=\$QTFLAGS"
+echo "On this machine the GLQTLIBS=\$GLQTLIBS"
+echo "On this machine the QTMOC=\$QTMOC"
+endif
+
+
 
 

trunk/config/scripts/env.sh.SH

@@ -524 +524 @@
 fi 
 
-#+
-if [ X$g4_qthome != X ] ; then
-QTHOME=$g4_qthome
-export QTHOME
-if [ X\$g4non_display = X ] ; then
-echo "On this machine the QTHOME=\$QTHOME"
-fi 
-fi
 
 
@@ -587 +579 @@
 fi
 fi 
+
+
+#
+# Qt Flags and Libs, messy, but needed for backward compatibility
+#+
+if [ "X$g4ui_build_qt_session" = "Xy" -o "X$g4ui_use_qt" = "Xy" ] ; then
+QTFLAGS="$g4_qt_cxxflags"
+QTLIBS="$g4_qt_libs"
+QTMOC="$g4_qt_moc"
+export QTFLAGS
+export QTLIBS
+export QTMOC
+echo "On this machine the QTFLAGS=\$QTFLAGS"
+echo "On this machine the QTLIBS=\$QTLIBS"
+echo "On this machine the QTMOC=\$QTMOC"
+fi
+
+if [ "X$g4vis_build_openglqt_driver" = "Xy" -o "X$g4vis_build_openglqt_driver" = "Xy" ] ; then
+if [ "X\$QTFLAGS" = "X" ] ; then
+QTFLAGS="$g4_qt_cxxflags $g4_qt_gl_cxxflags"
+else
+QTFLAGS="\$QTFLAGS $g4_qt_gl_cxxflags"
+fi
+if [ "X\$QTMOC" = "X" ] ; then
+QTMOC="$g4_qt_moc"
+fi
+GLQTLIBS="$g4_qt_libs $g4_qt_gl_libs"
+export QTFLAGS
+export QTMOC
+export GLQTLIBS
+echo "On this machine the QTFLAGS=\$QTFLAGS"
+echo "On this machine the GLQTLIBS=\$GLQTLIBS"
+echo "On this machine the QTMOC=\$QTMOC"
+fi
+
 
 

trunk/config/scripts/install.sh.SH

@@ -280 +280 @@
 export G4UI_BUILD_QT_SESSION
 echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION"
-fi 
+fi
 
 #+
@@ -354 +354 @@
 export G4VIS_BUILD_OPENGLQT_DRIVER
 echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER"
-fi 
+fi
 
 
@@ -442 +442 @@
 fi 
 
-#+
-if [ X$g4_qthome != X ] ; then
-QTHOME=$g4_qthome
-export QTHOME
-echo "On this machine the QTHOME=\$QTHOME"
-fi 
-
 
 #+
@@ -503 +496 @@
 fi
 fi 
+
+
+
+# Qt Flags and Libs, messy, but needed for backward compatibility
+#+
+if [ "X$g4ui_build_qt_session" = "Xy" -o "X$g4ui_use_qt" = "Xy" ] ; then
+QTFLAGS="$g4_qt_cxxflags"
+QTLIBS="$g4_qt_libs"
+QTMOC="$g4_qt_moc"
+export QTFLAGS
+export QTLIBS
+export QTMOC
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the QTFLAGS=\$QTFLAGS"
+echo "On this machine the QTLIBS=\$QTLIBS"
+echo "On this machine the QTMOC=\$QTMOC"
+fi
+fi
+
+if [ "X$g4vis_build_openglqt_driver" = "Xy" -o "X$g4vis_build_openglqt_driver" = "Xy" ] ; then
+if [ "X\$QTFLAGS" = "X" ] ; then
+QTFLAGS="$g4_qt_cxxflags $g4_qt_gl_cxxflags"
+else
+QTFLAGS="\$QTFLAGS $g4_qt_gl_cxxflags"
+fi
+if [ "X\$QTMOC" = "X" ] ; then
+QTMOC="$g4_qt_moc"
+fi
+GLQTLIBS="$g4_qt_libs $g4_qt_gl_libs"
+export QTFLAGS
+export QTMOC
+export GLQTLIBS
+if [ X\$g4non_display = X ] ; then
+echo "On this machine the QTFLAGS=\$QTFLAGS"
+echo "On this machine the GLQTLIBS=\$GLQTLIBS"
+echo "On this machine the QTMOC=\$QTMOC"
+fi
+fi