tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1--- a/CMakeLists.txt 2025-08-21 13:12:55
2+++ b/CMakeLists.txt 2025-08-21 13:16:26
3@@ -24,28 +24,8 @@
4 #Needed due to linker error with QtColorWidget
5 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
6
7+find_package(QtColorWidgets REQUIRED)
8
9-# Dependency can be fetched via flatpak builder
10-if(EXISTS "${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets/CMakeLists.txt")
11- add_subdirectory("${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets" EXCLUDE_FROM_ALL)
12-else()
13- FetchContent_Declare(
14- qtColorWidgets
15- GIT_REPOSITORY https://gitlab.com/mattbas/Qt-Color-Widgets.git
16- GIT_TAG 352bc8f99bf2174d5724ee70623427aa31ddc26a
17- )
18- #Workaround for duplicate GUID in windows WIX installer
19- if (WIN32)
20- FetchContent_GetProperties(qtColorWidgets)
21- if(NOT qtcolorwidgets_POPULATED)
22- FetchContent_Populate(qtColorWidgets)
23- add_subdirectory(${qtcolorwidgets_SOURCE_DIR} ${qtcolorwidgets_BINARY_DIR} EXCLUDE_FROM_ALL)
24- endif()
25- else()
26- FetchContent_MakeAvailable(qtColorWidgets)
27- endif()
28-endif()
29-
30 # This can be read from ${PROJECT_NAME} after project() is called
31 if (APPLE)
32 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
33@@ -133,12 +113,7 @@
34 option(BUILD_STATIC_LIBS ON)
35
36 if (APPLE)
37- FetchContent_Declare(
38- qHotKey
39- GIT_REPOSITORY https://github.com/flameshot-org/QHotkey
40- GIT_TAG master
41- )
42- FetchContent_MakeAvailable(QHotKey)
43+ find_package(QHotKey REQUIRED)
44 endif()
45
46 add_subdirectory(src)