COMP: SuperBuild: Support explicit overriding of QT_MIN_VERSION

SCIInstitute · Oct 27, 2022 · 41a8ddb · 41a8ddb
1 parent fb6c7d0
commit 41a8ddb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ before_install:
   - 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
 script:
   - cd bin
-  - cmake -GNinja -DTRAVIS_BUILD:BOOL=ON -DQt5_PATH=$(dpkg -L qtbase5-dev) ../Superbuild
+  - cmake -GNinja -DTRAVIS_BUILD:BOOL=ON -DQT_MIN_VERSION:STRING=5.9 -DQt5_PATH=$(dpkg -L qtbase5-dev) ../Superbuild
   - travis_wait 70 ninja
 
 after_success:

diff --git a/Superbuild/Superbuild.cmake b/Superbuild/Superbuild.cmake
@@ -142,13 +142,12 @@ else()
   option(DO_ZLIB_MANGLE "Mangle Zlib names to avoid conflicts with Qt5 or other external libraries" ON)
 endif()
 
-if (TRAVIS_BUILD)
-  set(QT_MIN_VERSION "5.9")
-else()
-  set(QT_MIN_VERSION "5.12")
-endif()
-
 if(SEG3D_BUILD_INTERFACE)
+
+  if(NOT DEFINED QT_MIN_VERSION)
+    set(QT_MIN_VERSION "5.12")
+  endif()
+
   set(Qt5_PATH "" CACHE PATH "Path to directory where Qt 5 is installed. Directory should contain lib and bin subdirectories.")
   #set(CMAKE_AUTOMOC ON)