File tree Expand file tree Collapse file tree 2 files changed +6
-7
lines changed Expand file tree Collapse file tree 2 files changed +6
-7
lines changed Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ before_install:
1010 - sudo apt-get -qq --yes install ninja-build mesa-common-dev libgl1-mesa-dev libglu1-mesa-dev mesa-utils-extra libglapi-mesa libglapi-mesa qt5-qmake qtbase5-dev libqt5opengl5-dev libqt5svg5-dev
1111script :
1212 - cd bin
13- - cmake -GNinja -DTRAVIS_BUILD:BOOL=ON -DQt5_PATH=$(dpkg -L qtbase5-dev) ../Superbuild
13+ - cmake -GNinja -DTRAVIS_BUILD:BOOL=ON -DQT_MIN_VERSION:STRING=5.9 - DQt5_PATH=$(dpkg -L qtbase5-dev) ../Superbuild
1414 - travis_wait 70 ninja
1515
1616after_success :
Original file line number Diff line number Diff line change @@ -142,13 +142,12 @@ else()
142142 option (DO_ZLIB_MANGLE "Mangle Zlib names to avoid conflicts with Qt5 or other external libraries" ON )
143143endif ()
144144
145- if (TRAVIS_BUILD)
146- set (QT_MIN_VERSION "5.9" )
147- else ()
148- set (QT_MIN_VERSION "5.12" )
149- endif ()
150-
151145if (SEG3D_BUILD_INTERFACE)
146+
147+ if (NOT DEFINED QT_MIN_VERSION)
148+ set (QT_MIN_VERSION "5.12" )
149+ endif ()
150+
152151 set (Qt5_PATH "" CACHE PATH "Path to directory where Qt 5 is installed. Directory should contain lib and bin subdirectories." )
153152 #set(CMAKE_AUTOMOC ON)
154153
You can’t perform that action at this time.
0 commit comments