diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-02 19:24:25 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-01-02 19:24:25 (GMT) |
| commit | 81311c670e02a554ba5e5c45329c4eda9c89bd72 (patch) | |
| tree | 426a7e11379329db938151bea013b554673d1ac9 /Tests | |
| parent | 2da175ce9d13ea4c16fdea1f808c1f661134ea05 (diff) | |
| parent | 950d76ed485bd98498fefa1eb63d86bda83d9159 (diff) | |
| download | CMake-81311c670e02a554ba5e5c45329c4eda9c89bd72.zip CMake-81311c670e02a554ba5e5c45329c4eda9c89bd72.tar.gz CMake-81311c670e02a554ba5e5c45329c4eda9c89bd72.tar.bz2 | |
Merge topic 'wix-rtf-encoding'
950d76e CPackWiX: allow and convert UTF-8 sequences in RTF writer
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CPackWiXGenerator/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/CPackWiXGenerator/license.txt | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/Tests/CPackWiXGenerator/CMakeLists.txt b/Tests/CPackWiXGenerator/CMakeLists.txt index 0b06045..bc3322e 100644 --- a/Tests/CPackWiXGenerator/CMakeLists.txt +++ b/Tests/CPackWiXGenerator/CMakeLists.txt @@ -51,6 +51,8 @@ set(CPACK_PACKAGE_EXECUTABLES set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_SOURCE_DIR}/patch.xml") +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/license.txt") + include(CPack) cpack_add_install_type(Full DISPLAY_NAME "Everything") diff --git a/Tests/CPackWiXGenerator/license.txt b/Tests/CPackWiXGenerator/license.txt new file mode 100644 index 0000000..7942783 --- /dev/null +++ b/Tests/CPackWiXGenerator/license.txt @@ -0,0 +1,9 @@ +hello world +merhaba dünya +ハローワールド +привет мир +مرحبا العالم +你好世界 + +4-Byte sequences: + Perch (Fish) 𩶘 Elevator 𨋢! |