Skip to content

Commit

Permalink
Force to use Qt5
Browse files Browse the repository at this point in the history
  • Loading branch information
sigurdp committed Jan 18, 2024
1 parent a0a4e25 commit 7d98322
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
8 changes: 8 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,14 @@ if(CMAKE_COMPILER_IS_GNUCC)

endif()


# !!!
# For now, we force Qt to version 5
message(STATUS "Forcing setting of CEE_USE_QT5 to ON")
set(CEE_USE_QT5 ON CACHE BOOL "Force usage of Qt5" FORCE)
message(STATUS "CEE_USE_QT5=${CEE_USE_QT5}")


add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibCore)
add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibGeometry)
add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibRender)
Expand Down
3 changes: 3 additions & 0 deletions Fwk/VizFwk/LibGuiQt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ endif()

find_package(OpenGL)


message(STATUS "In LibGuiQt, CEE_USE_QT6=${CEE_USE_QT6}")
message(STATUS "In LibGuiQt, CEE_USE_QT5=${CEE_USE_QT5}")
if (CEE_USE_QT6)
find_package(Qt6 COMPONENTS REQUIRED Core Gui Widgets OpenGLWidgets)
set(QT_LIBRARIES Qt6::Core Qt6::Gui Qt6::Widgets Qt6::OpenGLWidgets )
Expand Down

0 comments on commit 7d98322

Please sign in to comment.