Ignore:
Timestamp:
Jan 12, 2011, 2:39:54 PM (9 years ago)
Author:
michaelld@…
Message:

qt4 PortGroup Changes:

  • Add qt's pkg-config dir as a global.
  • Add a possible-future location for Qt's frameworks, as a global.
  • Fix debug check to use Qt's library and frameworks directories.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/_resources/port1.0/group/qt4-1.0.tcl

    r74339 r75030  
    4343            [variant_isset debug] && \
    4444           ![info exists building_qt4]} {
    45             if {![file exists ${prefix}/lib/libQtCore_debug.dylib]} {
     45            if {![file exists ${qt_frameworks_dir}/QtCore/QtCore_debug] &&
     46                ![file exists ${qt_libs_dir}/libQtCore_debug.dylib]} {
    4647                return -code error "\n\nERROR:\n\
    4748In order to install this port as +debug,
     
    8485set qt_libs_dir         ${qt_dir}/lib
    8586
     87# standard Qt libraries directory
     88global qt_frameworks_dir
     89set qt_frameworks_dir   ${qt_dir}/Library/Frameworks
     90
    8691# standard Qt non-.app executables directory
    8792global qt_bins_dir
     
    131136global qt_lrelease_cmd
    132137set qt_lrelease_cmd     ${qt_dir}/bin/lrelease
     138
     139# standard PKGCONFIG path
     140global qt_pkg_config_dir
     141set qt_pkg_config_dir   ${qt_dir}/lib/pkgconfig
    133142
    134143# standard cmake info for Qt4
     
    183192
    184193# append Qt's PKGCONFIG path to whatever is there now.
    185 set qt_pkg_config_path ${qt_dir}/lib/pkgconfig
     194set qt_pkg_config_path ${qt_pkg_config_dir}
    186195if {${qt_dir} != ${prefix}} {
    187196    set qt_pkg_config_path ${pkg_config_path}:${prefix}/lib/pkgconfig
Note: See TracChangeset for help on using the changeset viewer.