mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-12-28 03:37:59 +00:00
CONFIG: export ThirdParty Qt5_DIR (issue #827)
This commit is contained in:
@ -13,8 +13,8 @@
|
||||
# config.csh/example/paraview
|
||||
#
|
||||
# Description
|
||||
# Example of defining a different ParaView_VERSION but retaining
|
||||
# the standard config.csh/paraview mechanism
|
||||
# Example of defining a different ParaView_VERSION but retaining the
|
||||
# standard config.csh/paraview mechanism
|
||||
#
|
||||
# Note
|
||||
# This file could be copied to a user or site location, but should never
|
||||
@ -25,7 +25,8 @@
|
||||
|
||||
set pv=5.5.0
|
||||
set pv=5.5.0-mpipy
|
||||
set qt=qt-5.9.0
|
||||
|
||||
eval `foamEtcFile -csh -config -mode=o paraview -- ParaView_VERSION=$pv`
|
||||
eval `foamEtcFile -csh -config -mode=o paraview -- ParaView_VERSION=$pv ParaView_QT=$qt`
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
@ -120,8 +120,16 @@ if ( $?ParaView_VERSION ) then
|
||||
#OBSOLETE? endif
|
||||
|
||||
# QT libraries as required
|
||||
# Set Qt5_DIR to root directory.
|
||||
# Another possibility: "qtpaths --qt-version"
|
||||
|
||||
set qtDir="$archDir/$ParaView_QT"
|
||||
if ( -d "$qtDir" ) then
|
||||
switch ($ParaView_QT)
|
||||
case *-qt*:
|
||||
setenv Qt5_DIR $qtDir
|
||||
breaksw
|
||||
endsw
|
||||
foreach qtLibDir ("$qtDir/lib$WM_COMPILER_LIB_ARCH" "$qtDir/lib")
|
||||
if ( -d "$qtLibDir" ) then
|
||||
setenv LD_LIBRARY_PATH "${qtLibDir}:${LD_LIBRARY_PATH}"
|
||||
|
||||
@ -111,6 +111,7 @@ unsetenv ParaView_INCLUDE_DIR
|
||||
unsetenv ParaView_VERSION
|
||||
unsetenv PV_PLUGIN_PATH
|
||||
unsetenv VTK_DIR
|
||||
unsetenv Qt5_DIR # Perhaps only unset if it is in WM_THIRD_PARTY_DIR?
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# Unset other ThirdParty environment variables
|
||||
|
||||
Reference in New Issue
Block a user