Commit 31c73db5 authored by Ben Boeckel's avatar Ben Boeckel

qt5: default to Qt5

parent 3fb34de2
...@@ -183,8 +183,8 @@ endfunction () ...@@ -183,8 +183,8 @@ endfunction ()
set(CMB_TEST_DATA_ROOT "" CACHE PATH "Location of CMB's testing data") set(CMB_TEST_DATA_ROOT "" CACHE PATH "Location of CMB's testing data")
# Default Qt4 to ON. # Default Qt5 to ON.
set(_superbuild_default_qt4 ON) set(_superbuild_default_qt5 ON)
set(boost_minimum_version 1.60.0) set(boost_minimum_version 1.60.0)
set(boost_libraries set(boost_libraries
......
...@@ -21,8 +21,8 @@ SuperBuild CMake Project. ...@@ -21,8 +21,8 @@ SuperBuild CMake Project.
* Ubuntu 16.04 specific * Ubuntu 16.04 specific
* sudo apt-get install m4 * sudo apt-get install m4
* sudo apt-get install build-essential * sudo apt-get install build-essential
* turn on `use_SYSTEM_qt4` in CMake(Recommend) * turn on `USE_SYSTEM_qt5` in CMake(Recommend)
* sudo apt-get install qt4-qmake libqt4-dev qt4-dev-tools(if using system qt) * sudo apt-get install qt5-qmake libqt5-dev qt5-dev-tools (if using system qt)
* sudo apt-get install libxt-dev * sudo apt-get install libxt-dev
Note that the build process will also download additional tarballs and Note that the build process will also download additional tarballs and
...@@ -61,17 +61,13 @@ There are two possible methods you can use: CMake GUI or the ccmake command line ...@@ -61,17 +61,13 @@ There are two possible methods you can use: CMake GUI or the ccmake command line
changed using the `CMAKE_BUILD_TYPE_cmb` variable. Similar variables exist changed using the `CMAKE_BUILD_TYPE_cmb` variable. Similar variables exist
for other projects depending on the setup including `paraview` and `smtk`. for other projects depending on the setup including `paraview` and `smtk`.
* The process will also build Qt 4.8.6 by default. If you already have a Qt * The process will also build Qt 4.8.6 by default. If you already have a Qt
installed (4.8.\*) then you can do the following: installed (5.9 or newer) then you can do the following:
* Turn `USE_SYSTEM_qt4` on * Turn `USE_SYSTEM_qt5` on
* Tell CMake to configure * Tell CMake to configure
* Check to see if the `QT_QMAKE_EXECUTABLE` variable is set to the * Check to see if the `Qt5_DIR` variable is set to the appropriate location -
appropriate qmake - if is not then set it correctly if is not then set it correctly
* NOTE! Qt built on Mac OSX 10.9 and greater needs several patches to work * On Windows, the directory to the Qt5 libraries must be in the `PATH`
properly. These patches are automatically applied when Qt is built using environment variable in order to build.
the superbuild and it is the recommended way to build Qt. You will also
need to make sure you have a 10.9 SDK on your OSX platform
* On Windows, the directory to `qmake` must be in the `PATH` environment
variable in order to build.
* Tell CMake to configure * Tell CMake to configure
* Tell CMake to generate * Tell CMake to generate
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment