Upgrade to Qt 5.13.2 - Issue 2247 (#2271)

* initial commit * added build3rdParty.py * Ubuntu mods * CentOS updates * OSX updates * OSX updates * updates * Ubuntu update * Removed script * windows update * Fix PRegionSelector warning
NCAR · Apr 16, 2020 · abf3388 · abf3388
1 parent 76a878a
commit abf3388
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/buildutils/OSX_PostBuild.py b/buildutils/OSX_PostBuild.py
diff --git a/site_files/site.NCAR b/site_files/site.NCAR
@@ -1,17 +1,17 @@
 if (APPLE)
     set (THIRD_PARTY_DIR     /usr/local/VAPOR-Deps/2019-Aug			           )
-    set (QTDIR               /usr/local/VAPOR-Deps/2019-Aug/Qt/5.12.4/clang_64 )
+    set (QTDIR               /usr/local/VAPOR-Deps/2019-Aug/Qt/5.13.2/clang_64 )
     set (CMAKE_PREFIX_PATH   ${QTDIR}/lib/cmake                                )
     list (APPEND CMAKE_PREFIX_PATH ${QTDIR}/lib/cmake                          )
 elseif (UNIX AND NOT APPLE)
     set (THIRD_PARTY_DIR     /usr/local/VAPOR-Deps/2019-Aug			     )
-    set (QTDIR                /usr/local/VAPOR-Deps/2019-Aug/Qt/5.12.4/gcc_64)
+    set (QTDIR                /usr/local/VAPOR-Deps/2019-Aug/Qt/5.13.2/gcc_64)
     set (CMAKE_PREFIX_PATH    ${QTDIR}/lib/cmake )
     set (Qt5Core_DIR          ${QTDIR}/lib/cmake/Qt5Core )
     set (QT_QMAKE_EXECUTABLE  ${QTDIR}/gcc_64/bin/qmake )
 else ()
 	set (THIRD_PARTY_DIR    C:/2019-Aug)
-    set (QTDIR              ${THIRD_PARTY_DIR}/Qt5_12_4/5.12.4/msvc2015_64)
+    set (QTDIR              ${THIRD_PARTY_DIR}/Qt/5.13.2/msvc2015_64)
     set (CMAKE_PREFIX_PATH  ${QTDIR}/lib/cmake/Qt5) 
 endif ()