diff options
| author | Brad King <brad.king@kitware.com> | 2018-05-31 12:47:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-05-31 12:50:15 (GMT) |
| commit | d155b536cb2c391c883b1c84519e48a74fe1c97a (patch) | |
| tree | 78dfb21f27e41f3e4ff95a64670eb830d045ef3d | |
| parent | 61c4858c3741da533d100eb0cbbebfd9fc720d20 (diff) | |
| parent | ca49f1a8e4cce294b2c4c10e80418b736986c2dd (diff) | |
| download | CMake-d155b536cb2c391c883b1c84519e48a74fe1c97a.zip CMake-d155b536cb2c391c883b1c84519e48a74fe1c97a.tar.gz CMake-d155b536cb2c391c883b1c84519e48a74fe1c97a.tar.bz2 | |
Merge topic 'cpack-wix-sources'
ca49f1a8e4 CPack: Fix cross-compilation of WiX generator
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2116
| -rw-r--r-- | Source/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 316d50b..30bef74 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -957,8 +957,8 @@ if(CYGWIN) endif() if(WIN32 OR (CYGWIN AND LibUUID_FOUND)) set(CPACK_SRCS ${CPACK_SRCS} - CPack/Wix/cmCMakeToWixPath.cxx - CPack/Wix/cmCMakeToWixPath.h + CPack/WiX/cmCMakeToWixPath.cxx + CPack/WiX/cmCMakeToWixPath.h CPack/WiX/cmCPackWIXGenerator.cxx CPack/WiX/cmCPackWIXGenerator.h CPack/WiX/cmWIXAccessControlList.cxx |