blob: eae28c13a4c2c37c88d1da09284cbb9df3266421 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
|
--- build_visit2_11_0 2016-10-11 11:25:17.084725631 +0200
+++ build_visit2_11_0.new 2016-10-11 11:24:51.038404838 +0200
@@ -16573,8 +16573,9 @@
echo "SETUP_APP_VERSION(QT $QT_VERSION)" >> $HOSTCONF
if [[ "$IS_QT5" == "yes" ]]; then
echo "VISIT_OPTION_DEFAULT(VISIT_QT5 ON TYPE BOOL)" >> $HOSTCONF
- echo "VISIT_OPTION_DEFAULT(VISIT_QT_DIR \${VISITHOME}/qt/\${QT_VERSION}/\${VISITARCH})" >> $HOSTCONF
- echo "VISIT_OPTION_DEFAULT(VISIT_QT_BIN \${VISIT_QT_DIR}/bin)" >> $HOSTCONF
+ echo "VISIT_OPTION_DEFAULT(VISIT_QT_DIR ${QT_INSTALL_DIR})" >> $HOSTCONF
+ echo "VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${QT_BIN_DIR})" >> $HOSTCONF
+ echo "SET(VISIT_QT_SKIP_INSTALL ON)" >> $HOSTCONF
else
if [[ $USE_SYSTEM_QT == "yes" ]]; then
echo "VISIT_OPTION_DEFAULT(QT_QTUITOOLS_INCLUDE_DIR ${QT_QTUITOOLS_INCLUDE_DIR})" >> $HOSTCONF
|