Skip to content

Commit 1902a29

Browse files
committed
Fix Windows installation and add WiX packaging config
1 parent 5ab3472 commit 1902a29

File tree

4 files changed

+26
-2
lines changed

4 files changed

+26
-2
lines changed

install.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
# Note: each DESTINATION keyword needs its own COMPONENT specification!
12
install(TARGETS projectMSDL
23
RUNTIME_DEPENDENCY_SET projectMSDLDepends
34
RUNTIME DESTINATION ${PROJECTMSDL_BIN_DIR}
5+
COMPONENT projectMSDL
46
BUNDLE DESTINATION . # .app bundle will reside at the top-level of the install prefix
57
COMPONENT projectMSDL
68
)
@@ -21,6 +23,9 @@ if(ENABLE_INSTALL_BDEPS)
2123
"^/lib(32|64)?/+"
2224
"^/usr/lib(32|64)?/+"
2325
"^/Library/+"
26+
".*system32/.*\\.dll"
27+
PRE_EXCLUDE_REGEXES
28+
".*api-ms-win-crt-.*\\.dll"
2429

2530
LIBRARY DESTINATION ${PROJECTMSDL_LIB_DIR}
2631
RUNTIME DESTINATION ${PROJECTMSDL_LIB_DIR}

packaging-windows.cmake

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,19 @@ set(CPACK_PACKAGE_HOMEPAGE_URL "https://projectm-visualizer.org/")
99
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/src/resources/gpl-3.0.txt")
1010
set(CPACK_STRIP_FILES TRUE)
1111

12+
# WiX generator
13+
14+
# Start menu entry
15+
set_property(INSTALL $<TARGET_FILE_NAME:projectMSDL>
16+
PROPERTY CPACK_START_MENU_SHORTCUTS "projectMSDL"
17+
)
18+
19+
set(CPACK_WIX_UPGRADE_GUID "7d15f9b9-1122-4d5e-bc31-61bb93d7480a")
20+
set(CPACK_WIX_LICENSE_RTF "${CMAKE_SOURCE_DIR}/src/resources/gpl-3.0.rtf")
21+
set(CPACK_WIX_PRODUCT_ICON "${CMAKE_SOURCE_DIR}/src/resources/icons/icon.ico")
22+
set(CPACK_WIX_PROGRAM_MENU_FOLDER "projectM")
23+
set(CPACK_WIX_PROPERTY_ARPHELPLINK "https://github.com/projectM-visualizer/projectm/wiki")
24+
1225
# Package generator defaults. Override using "cpack -G [generator]"
1326
set(CPACK_GENERATOR ZIP)
1427
set(CPACK_SOURCE_GENERATOR ZIP)

vcpkg-configuration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json",
33
"default-registry": {
44
"kind": "git",
5-
"baseline": "638b1588be3a265a9c7ad5b212cef72a1cad336a",
5+
"baseline": "a62ce77d56ee07513b4b67de1ec2daeaebfae51a",
66
"repository": "https://github.com/microsoft/vcpkg"
77
}
88
}

vcpkg.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
"dependencies": [
44
"glew",
55
"sdl2",
6-
"poco",
6+
{
7+
"name": "poco",
8+
"features": [
9+
"util"
10+
]
11+
},
12+
"projectm",
713
"freetype"
814
]
915
}

0 commit comments

Comments
 (0)