Skip to content

Commit 43cb2ba

Browse files
committed
Moved Qt Color Widgets to FetchContent
1 parent f7a049e commit 43cb2ba

File tree

129 files changed

+9
-16543
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+9
-16543
lines changed

CMakeLists.txt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ set(FLAMESHOT_VERSION 12.1.0)
55

66
# Flameshot-org
77
set(GIT_API_URL "https://api.github.com/repos/flameshot-org/flameshot/releases/latest")
8-
# Namecheap
9-
# set(GIT_API_URL "https://api.github.com/repos/namecheap/flameshot/releases/latest")
108

119
# TODO - fix it for all linux distros
1210
#find_package (Git)
@@ -36,6 +34,15 @@ project(
3634
LANGUAGES CXX)
3735
set(PROJECT_NAME_CAPITALIZED "Flameshot")
3836

37+
include(FetchContent)
38+
39+
FetchContent_Declare(
40+
qtColorWidgets
41+
GIT_REPOSITORY https://gitlab.com/mattbas/Qt-Color-Widgets.git
42+
GIT_TAG v2.2.0
43+
)
44+
FetchContent_MakeAvailable(qtColorWidgets)
45+
3946
# This can be read from ${PROJECT_NAME} after project() is called
4047
if (APPLE)
4148
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
@@ -111,8 +118,6 @@ endif()
111118

112119
option(BUILD_STATIC_LIBS ON)
113120
option(BUILD_SHARED_LIBS OFF)
114-
add_subdirectory(external/Qt-Color-Widgets EXCLUDE_FROM_ALL)
115-
116121

117122
if (APPLE)
118123
add_subdirectory(external/QHotkey)

external/Qt-Color-Widgets/CMakeLists.txt

Lines changed: 0 additions & 167 deletions
This file was deleted.

external/Qt-Color-Widgets/COPYING

Lines changed: 0 additions & 165 deletions
This file was deleted.

0 commit comments

Comments
 (0)