-
-
Notifications
You must be signed in to change notification settings - Fork 228
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #252 from cneben/develop
2.5.0
- Loading branch information
Showing
243 changed files
with
3,481 additions
and
2,815 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,3 +14,5 @@ samples/build* | |
.idea | ||
.DS_Store | ||
build-tests-* | ||
|
||
build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,38 @@ | ||
cmake_minimum_required(VERSION 3.5.0) | ||
cmake_minimum_required(VERSION 3.16) | ||
|
||
project(QuickQanava VERSION 2.4.0 LANGUAGES CXX) | ||
project(QuickQanava VERSION 2.5.0 LANGUAGES CXX) | ||
set_property(GLOBAL PROPERTY USE_FOLDERS ON) | ||
|
||
set(CMAKE_CXX_STANDARD 14) | ||
set(CMAKE_CXX_STANDARD 17) | ||
set(CMAKE_CXX_STANDARD_REQUIRED ON) | ||
|
||
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick Qml Quick QuickControls2) | ||
find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml Quick QuickControls2) | ||
|
||
message("Building QuickQanava for Qt${QT_VERSION_MAJOR}") | ||
|
||
option(QUICK_QANAVA_BUILD_SAMPLES "Build the samples" FALSE) | ||
add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050F00) | ||
|
||
if (${QT_VERSION_MAJOR} EQUAL 5) | ||
include(CMakeLists.qt5.txt) | ||
else() | ||
include(CMakeLists.qt6.txt) | ||
add_subdirectory(src) | ||
|
||
option(QUICK_QANAVA_BUILD_SAMPLES "Build QuickQanava samples" OFF) | ||
if (${QUICK_QANAVA_CI}) | ||
add_subdirectory(samples/groups) # Used to test CI | ||
endif() | ||
|
||
add_subdirectory(src) | ||
if (${QUICK_QANAVA_BUILD_SAMPLES}) | ||
add_subdirectory(samples/advanced) | ||
add_subdirectory(samples/connector) | ||
add_subdirectory(samples/cpp) | ||
|
||
add_subdirectory(samples/dataflow) | ||
add_subdirectory(samples/edges) | ||
add_subdirectory(samples/navigable) | ||
|
||
add_subdirectory(samples/groups) | ||
add_subdirectory(samples/nodes) | ||
add_subdirectory(samples/layouts) | ||
add_subdirectory(samples/selection) | ||
|
||
add_subdirectory(samples/style) | ||
add_subdirectory(samples/topology) | ||
endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
2.5.0 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.