Skip to content

Commit 4ef7e3a

Browse files
committed
Fix windows WIX package
This commit was authored with the help of Claude.ai and should be viewed with some skepticism. Ultimately the windows packaging needs to be rewritten because it's relying on an unmaintained version of WIX.
1 parent 663a056 commit 4ef7e3a

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

CMakeLists.txt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,17 @@ FetchContent_Declare(
4141
GIT_REPOSITORY https://gitlab.com/mattbas/Qt-Color-Widgets.git
4242
GIT_TAG 352bc8f99bf2174d5724ee70623427aa31ddc26a
4343
)
44-
FetchContent_MakeAvailable(qtColorWidgets)
4544

45+
#Workaround for duplicate GUID in windows WIX installer
46+
if (WIN32)
47+
FetchContent_GetProperties(qtColorWidgets)
48+
if(NOT qtcolorwidgets_POPULATED)
49+
FetchContent_Populate(qtColorWidgets)
50+
add_subdirectory(${qtcolorwidgets_SOURCE_DIR} ${qtcolorwidgets_BINARY_DIR} EXCLUDE_FROM_ALL)
51+
endif()
52+
else()
53+
FetchContent_MakeAvailable(qtColorWidgets)
54+
endif()
4655

4756

4857
# This can be read from ${PROJECT_NAME} after project() is called

0 commit comments

Comments
 (0)