Changeset 1002 for trunk/Configure


Ignore:
Timestamp:
Apr 20, 2009, 2:51:32 PM (15 years ago)
Author:
garnier
Message:

test

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Configure

    r1001 r1002  
    23802380            # checking moc version
    23812381            g4_qt_moc_major_version=\`\$g4_qt_moc -v 2>&1|sed 's/^.*(Qt \(.*\)\..*\..*)/\1/'\`
     2382            echo "checking for moc... found \$g4_qt_moc version \$g4_qt_moc_major_version"
    23822383            if test "$g4_qt_version" = "$g4_qt_moc_major_version" ; then
    2383                 echo "checking for moc... found \$g4_qt_moc version \$g4_qt_moc_major_version"
    2384 
    23852384                g4_qt_dir=\`dirname \$g4_qt_include_dir\`
    23862385                g4_qt_dir=\`dirname \$g4_qt_dir\`
     
    23922391                g4_qt_gl_libs="-framework QtOpenGL"
    23932392            else
    2394                 echo "checking for moc... found \$g4_qt_moc for Qt version \$g4_qt_moc_major_version, but Qt \$g4_qt_version path is used. Please update/move \$g4_qt_moc to Qt \$g4_qt_version"
     2393                echo "moc version (\$g4_qt_moc_major_version) is not compatible with previous founded Qt (\$g4_qt_ver) version. Please update/move \$g4_qt_moc to Qt \$g4_qt_ver compatible version"
    23952394                g4_havegoodqt=no
    23962395            fi
     
    25542553        # checking moc version
    25552554        g4_qt_moc_major_version=\`\$g4_qtmoc -v 2>&1|sed 's/^.*(Qt \(.*\)\..*\..*)/\1/'\`
    2556         echo "checking for moc222... found \$g4_qtmoc version \$g4_qt_moc_major_version --------- \$g4_qt_major_ver = \$g4_qt_moc_major_version"
     2555        echo "checking for moc... found \$g4_qtmoc version \$g4_qt_moc_major_version"
    25572556
    25582557        if test "\$g4_qt_major_ver" = "\$g4_qt_moc_major_version" ; then
    25592558            g4_havegoodqt=yes
    25602559        else
    2561             echo "checking for moc... found \$g4_qt_moc for Qt version \$g4_qt_moc_major_version, but Qt \$g4_qt_major_ver path is used. Please update/move \$g4_qt_moc to Qt \$g4_qt_major_ver"
     2560            echo "moc version (\$g4_qt_moc_major_version) is not compatible with previous founded Qt (\$g4_qt_major_ver) version. Please update/move \$g4_qt_moc to Qt \$g4_qt_major_ver compatible version"
    25622561            g4_havegoodqt=no
    25632562        fi
Note: See TracChangeset for help on using the changeset viewer.