Skip to content

Commit

Permalink
Signed-off-by: cneben <[email protected]>
Browse files Browse the repository at this point in the history
# Conflicts:
#	CMakeLists.txt

Signed-off-by: cneben <[email protected]>
  • Loading branch information
cneben committed Nov 17, 2023
1 parent ce73ca9 commit 0264f6a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick Qml Quick QuickCont

message("Building QuickQanava for Qt${QT_VERSION_MAJOR}")

option(QUICK_QANAVA_BUILD_SAMPLES "Build the samples" FALSE)

if (${QT_VERSION_MAJOR} EQUAL 5)
include(CMakeLists.qt5.txt)
else()
Expand Down
3 changes: 1 addition & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,7 @@ set (quickcontainers_header_files
quickcontainers/qcmAdapter.h
)

message(QUICKQANAVA_QT_MAJOR_VERSION= ${QUICKQANAVA_QT_MAJOR_VERSION})
if (${QUICKQANAVA_QT_MAJOR_VERSION} EQUAL 5)
if (${QT_VERSION_MAJOR} EQUAL 5)
include(CMakeLists.qt5.txt)
else()
include(CMakeLists.qt6.txt)
Expand Down

0 comments on commit 0264f6a

Please sign in to comment.