ThirdParty: QT 4.7.0: adding the environment variable QT_LIB_DIR
This commit is contained in:
parent
2bfdc4b566
commit
26fe1af615
1 changed files with 7 additions and 0 deletions
|
@ -130,9 +130,11 @@ cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
|
||||||
|
|
||||||
export QT_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
|
export QT_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
|
||||||
export QT_BIN_DIR=\$QT_DIR/bin
|
export QT_BIN_DIR=\$QT_DIR/bin
|
||||||
|
export QT_LIB_DIR=\$QT_DIR/lib
|
||||||
|
|
||||||
# Enable access to the runtime package applications
|
# Enable access to the runtime package applications
|
||||||
[ -d \$QT_BIN_DIR ] && _foamAddPath \$QT_BIN_DIR
|
[ -d \$QT_BIN_DIR ] && _foamAddPath \$QT_BIN_DIR
|
||||||
|
[ -d \$QT_LIB_DIR ] && _foamAddLib \$QT_LIB_DIR
|
||||||
DOT_SH_EOF
|
DOT_SH_EOF
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -143,10 +145,15 @@ cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.cs
|
||||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
setenv QT_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
|
setenv QT_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
|
||||||
setenv QT_BIN_DIR \$QT_DIR/bin
|
setenv QT_BIN_DIR \$QT_DIR/bin
|
||||||
|
setenv QT_LIB_DIR \$QT_DIR/lib
|
||||||
|
|
||||||
if ( -e \$QT_BIN_DIR ) then
|
if ( -e \$QT_BIN_DIR ) then
|
||||||
_foamAddPath \$QT_BIN_DIR
|
_foamAddPath \$QT_BIN_DIR
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if ( -e \$QT_LIB_DIR ) then
|
||||||
|
_foamAddLib \$QT_LIB_DIR
|
||||||
|
endif
|
||||||
DOT_CSH_EOF
|
DOT_CSH_EOF
|
||||||
|
|
||||||
#finally, generate a .tgz file for systems where using rpm for installing packages
|
#finally, generate a .tgz file for systems where using rpm for installing packages
|
||||||
|
|
Reference in a new issue