mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'wix-empty-components'

Browse Source 
6e3f6e925d CPack/WiX: Allow multiple empty top-level components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11172
This commit is contained in:
Brad King
2025-09-12 15:28:02 +00:00
committed by Kitware Robot
parent e990e60dd9 6e3f6e925d
commit 064df8a511
4 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/CPack/WiX/cmCPackWIXGenerator.cxx
View File

@@ -1040,6 +1040,10 @@ void cmCPackWIXGenerator::AddDirectoryAndFileDefinitions(
if (emptyDirectory) {
createDirectory = true;
if (directoryId == "INSTALL_ROOT") {
return;
}
}
if (directoryInstalledFile) {

2
Tests/RunCMake/CPack_WIX/3-AppWiX-cpack-WIX-stdout.txt
View File

@@ -3,6 +3,8 @@ CPack: Install projects
CPack: - Install project: CPackWiXGenerator \[Release\]
CPack: - Install component: applications
CPack: - Install component: applications2
CPack: - Install component: empty1
CPack: - Install component: empty2
CPack: - Install component: extras
CPack: - Install component: headers
CPack: - Install component: libraries

2
Tests/RunCMake/CPack_WIX/4-AppWiX-cpack-WIX-stdout.txt
View File

@@ -3,6 +3,8 @@ CPack: Install projects
CPack: - Install project: CPackWiXGenerator \[Release\]
CPack: - Install component: applications
CPack: - Install component: applications2
CPack: - Install component: empty1
CPack: - Install component: empty2
CPack: - Install component: extras
CPack: - Install component: headers
CPack: - Install component: libraries

3
Tests/RunCMake/RunCPack/AppWiX/CMakeLists.txt
View File

@@ -33,6 +33,9 @@ install(FILES mylib.h "file with spaces.h"
DESTINATION include
COMPONENT headers)
install(CODE "" COMPONENT "empty1")
install(CODE "" COMPONENT "empty2")
set(CPACK_GENERATOR "WIX")
set(CPACK_PACKAGE_NAME "MyLib")